[PATCH] Rework built-in diff to make its output more dense.

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index b2adc5fc4583e6089f4b38a47e1a73caad183f20..b521d05ffeefd7ed76dcfa283e7f974a684e9dfd 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -9,7 +9,7 @@
 #
 #
 # Handle some trivial cases.. The _really_ trivial cases have
-# been handled already by read-tree, but that one doesn't
+# been handled already by git-read-tree, but that one doesn't
 # do any merges that migth change the tree layout
 #
 
@@ -20,37 +20,68 @@ mkdir -p "$dir"
 
 case "${1:-.}${2:-.}${3:-.}" in
 #
-# deleted in both, or deleted in one and unchanged in the other
+# deleted in both
+#
+"$1..")
+       echo "ERROR: $4 is removed in both branches"
+       echo "ERROR: This is a potential rename conflict"
+       exit 1;;
+#
+# deleted in one and unchanged in the other
 #
 "$1.." | "$1.$1" | "$1$1.")
        rm -f -- "$4"
-       update-cache --remove -- "$4"
+       echo "Removing $4"
+       git-update-cache --remove -- "$4"
        exit 0
        ;;
 
 #
-# added in one, or added identically in both
+# added in one
 #
-".$2." | "..$3" | ".$2$2")
-       mv $(unpack-file "${2:-$3}") $4
-       update-cache --add -- $4
+".$2." | "..$3" )
+       echo "Adding $4 with perm $6$7"
+       mv $(git-unpack-file "$2$3") $4
+       chmod "$6$7" $4
+       git-update-cache --add -- $4
        exit 0
        ;;
-
+#
+# Added in both (check for same permissions)
+#
+".$2$2")
+       if [ "$6" != "$7" ]; then
+               echo "ERROR: File $4 added in both branches, permissions conflict $6->$7"
+               exit 1
+       fi
+       echo "Adding $4 with perm $6"
+       mv $(git-unpack-file "$2") $4
+       chmod "$6" $4
+       git-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)
+       orig=$(git-unpack-file $1)
+       src1=$(git-unpack-file $2)
+       src2=$(git-unpack-file $3)
        merge "$src2" "$orig" "$src1"
-       if [ $? -ne 0 ]; then
-               echo Leaving conflict merge in $src2
+       ret=$?
+       if [ "$6" != "$7" ]; then
+               echo "ERROR: Permissions $5->$6->$7 don't match merging $src2"
+               if [ $ret -ne 0 ]; then
+                       echo "ERROR: Leaving conflict merge in $src2"
+               fi
+               exit 1
+       fi
+       chmod -- "$6" "$src2"
+       if [ $ret -ne 0 ]; then
+               echo "ERROR: Leaving conflict merge in $src2"
                exit 1
        fi
-       cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
+       cp -- "$src2" "$4" && chmod -- "$6" "$4" &&  git-update-cache --add -- "$4" && exit 0
        ;;
 
 *)