[PATCH] Fix broken diff-cache output on added files

[git.git] / git-merge-one-file-script

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 26dbe63..b2adc5f 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -2,34 +2,59 @@
 #
 # This is the git merge script, called with
 #
-#   $1 - original file (or empty string)
-#   $2 - file in branch1 (or empty string)
-#   $3 - file in branch2 (or empty string)
+#   $1 - original file SHA1 (or empty)
+#   $2 - file in branch1 SHA1 (or empty)
+#   $3 - file in branch2 SHA1 (or empty)
 #   $4 - pathname in repository
 #
 #
-# Case 1: file removed in both
+# Handle some trivial cases.. The _really_ trivial cases have
+# been handled already by read-tree, but that one doesn't
+# do any merges that migth change the tree layout
 #
-if [ -z "$2$3" ]; then
-       rm -- "$4"
-       update-cache --remove -- "$4"
-       exit 0
-fi
+
+# if the directory is newly added in a branch, it might not exist
+# in the current tree
+dir=$(dirname "$4")
+mkdir -p "$dir"
+
+case "${1:-.}${2:-.}${3:-.}" in
 #
-# Case 2: file exists in just one
+# deleted in both, or deleted in one and unchanged in the other
 #
-if [ "$2$3" == "$3$2" ]; then
-       cat "$2$3" > "$4"
-       update-cache --add -- "$4"
+"$1.." | "$1.$1" | "$1$1.")
+       rm -f -- "$4"
+       update-cache --remove -- "$4"
        exit 0
-fi
+       ;;
+
 #
-# Case 3: file exists in both
+# added in one, or added identically in both
 #
-src="$1"
-if [ -z "$1" ]; then
-       src=/dev/null
-fi     
-echo "Auto-merging $4"
-cp "$3" "$4"
-merge "$4" "$src" "$2" && update-cache --add -- "$4"
+".$2." | "..$3" | ".$2$2")
+       mv $(unpack-file "${2:-$3}") $4
+       update-cache --add -- $4
+       exit 0
+       ;;
+
+#
+# Modified in both, but differently ;(
+#
+"$1$2$3")
+       echo "Auto-merging $4"
+       orig=$(unpack-file $1)
+       src1=$(unpack-file $2)
+       src2=$(unpack-file $3)
+       merge "$src2" "$orig" "$src1"
+       if [ $? -ne 0 ]; then
+               echo Leaving conflict merge in $src2
+               exit 1
+       fi
+       cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
+       ;;
+
+*)
+       echo "Not handling case $1 -> $2 -> $3"
+       ;;
+esac
+exit 1