- # Create the working tree file, with the correct permission bits.
- # we can not rely on the fact that our tree has the path, because
- # we allow the merge to be done in an unchecked-out working tree.
- verify_path "$4" &&
- git-cat-file blob "$2" >"$4" &&
- case "$6" in *7??) chmod +x -- "$4" ;; esac &&
- merge "$4" "$orig" "$src2"
+ # Be careful for funny filename such as "-L" in "$4", which
+ # would confuse "merge" greatly.
+ src1=`git-unpack-file $2`
+ merge "$src1" "$orig" "$src2"