Commit b539c5e8 authored by Junio C Hamano's avatar Junio C Hamano

git-merge-one: new merge world order.

This does two things:

 - Use new --stage=2 option to create the working tree file with
   leading paths and correct permission bits using
   checkout-index, as before.

 - Make sure we do not confuse "merge" program when the file
   being merged has an unfortunate name, '-L'.
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 3bd348ae
......@@ -16,14 +16,6 @@
# been handled already by git-read-tree, but that one doesn't
# do any merges that might change the tree layout.
verify_path() {
dir=`dirname "$file"` &&
mkdir -p "$dir" &&
rm -f -- "$file" &&
: >"$file"
case "${1:-.}${2:-.}${3:-.}" in
# Deleted in both or deleted in one and unchanged in the other
......@@ -95,15 +87,16 @@ case "${1:-.}${2:-.}${3:-.}" in
# 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"
rm -f -- "$orig" "$src2"
# Create the working tree file, using "our tree" version from the
# index, and then store the result of the merge.
git-checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
rm -f -- "$orig" "$src1" "$src2"
if [ "$6" != "$7" ]; then
echo "ERROR: Permissions conflict: $5->$6,$7."
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment