X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file-script;h=3e128c665da501f9b07d3b2a932110394f2f169f;hb=7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a;hp=26dbe63e0217d6e6761e8c758b1633169266b345;hpb=839a7a06f35bf8cd563a41d6db97f453ab108129;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 26dbe63e..3e128c66 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -2,34 +2,73 @@
 #
 # 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
+#   $5 - orignal file mode (or empty)
+#   $6 - file in branch1 mode (or empty)
+#   $7 - file in branch2 mode (or empty)
 #
+# 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.
+
+case "${1:-.}${2:-.}${3:-.}" in
 #
-# Case 1: file removed in both
+# Deleted in both.
 #
-if [ -z "$2$3" ]; then
-	rm -- "$4"
-	update-cache --remove -- "$4"
-	exit 0
-fi
+"$1..")
+	echo "ERROR: $4 is removed in both branches."
+	echo "ERROR: This is a potential rename conflict."
+	exit 1;;
 #
-# Case 2: file exists in just one
+# Deleted in one and unchanged in the other.
 #
-if [ "$2$3" == "$3$2" ]; then
-	cat "$2$3" > "$4"
-	update-cache --add -- "$4"
-	exit 0
-fi
+"$1.." | "$1.$1" | "$1$1.")
+	echo "Removing $4"
+	exec git-update-cache --force-remove "$4" ;;
 #
-# Case 3: file exists in both
+# Added in one.
 #
-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" )
+	case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
+	echo "Adding $4 with perm $mode."
+	exec git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" ;;
+#
+# Added in both (check for same permissions).
+#
+".$3$2")
+	if [ "$6" != "$7" ]; then
+		echo "ERROR: File $4 added identically in both branches,"
+		echo "ERROR: but permissions conflict $6->$7."
+		exit 1
+	fi
+	case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+	echo "Adding $4 with perm $mode"
+	exec git-update-cache --add --cacheinfo "$6" "$2" "$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."
+	fi
+	if [ $ret -ne 0 ]; then
+		echo "ERROR: Leaving conflict merge in $src2."
+		exit 1
+	fi
+	sha1=`git-write-blob "$src2"` || {
+		echo "ERROR: Leaving conflict merge in $src2."
+	}
+	exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;
+*)
+	echo "ERROR: Not handling case $4: $1 -> $2 -> $3" ;;
+esac
+exit 1