date.c: allow even more varied time formats

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

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 26dbe63..cefbe63 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -2,34 +2,85 @@
 #
 # 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 git-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" || exit
+
+case "${1:-.}${2:-.}${3:-.}" in
 #
-# Case 2: file exists in just one
+# deleted in both
 #
-if [ "$2$3" == "$3$2" ]; then
-       cat "$2$3" > "$4"
-       update-cache --add -- "$4"
-       exit 0
-fi
+"$1..")
+       echo "ERROR: $4 is removed in both branches"
+       echo "ERROR: This is a potential rename conflict"
+       exit 1;;
 #
-# Case 3: file exists in both
+# deleted in one and unchanged in the other
 #
-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"
+"$1.." | "$1.$1" | "$1$1.")
+       echo "Removing $4"
+       rm -f -- "$4" && exec git-update-cache --remove -- "$4" ;;
+#
+# added in one
+#
+".$2." | "..$3" )
+       case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
+       echo "Adding $4 with perm $mode"
+       rm -f -- "$4" &&
+       git-cat-file blob "$2$3" >"$4" &&
+       chmod "$mode" -- "$4" &&
+       exec git-update-cache --add -- "$4" ;;
+#
+# 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
+       case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+       echo "Adding $4 with perm $mode"
+       rm -f -- "$4" &&
+       git-cat-file blob "$2" >"$4" &&
+       chmod "$mode" -- "$4" &&
+       exec git-update-cache --add -- "$4" ;;
+#
+# Modified in both, but differently ;(
+#
+"$1$2$3")
+       echo "Auto-merging $4"
+       orig=$(git-unpack-file $1)
+       src1=$(git-unpack-file $2)
+       src2=$(git-unpack-file $3)
+       merge "$src2" "$orig" "$src1"
+       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
+       if [ $ret -ne 0 ]; then
+               echo "ERROR: Leaving conflict merge in $src2"
+               exit 1
+       fi
+       case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+       rm -f -- "$4" && cat "$src2" >"$4" && chmod "$mode" -- "$4" &&
+       exec git-update-cache --add -- "$4" ;;
+*)
+       echo "Not handling case $4: $1 -> $2 -> $3" ;;
+esac
+exit 1