X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file-script;h=be64c072862b5c5985fbe1495864b0c8d09391c0;hb=0b124bb4bf8eafae8a4eae9c1fc44bf63da2e62e;hp=f0353c14b4c116a07a4a2b67453707767e4a1a3f;hpb=566487c8a617c12d68bf22c7078bce0b94fc8121;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index f0353c14..be64c072 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -18,33 +18,23 @@
 
 case "${1:-.}${2:-.}${3:-.}" in
 #
-# Deleted in both.
+# Deleted in both or deleted in one and unchanged in the other
 #
-"$1..")
-	echo "WARNING: $4 is removed in both branches."
-	echo "WARNING: This is a potential rename conflict."
-	rm -f -- "$4" &&
-		exec git-update-cache --remove -- "$4"
-	;;
-
-#
-# Deleted in one and unchanged in the other.
-#
-"$1.$1" | "$1$1.")
+"$1.." | "$1.$1" | "$1$1.")
 	echo "Removing $4"
-	exec rm -f -- "$4" &&
-		git-update-cache --remove -- "$4"
+	if test -f "$4"; then
+		rm -f -- "$4"
+	fi &&
+		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."
-	exec git-cat-file blob "$2$3" >"$4" &&
-		chmod $mode -- "$4" &&
-		git-update-cache --add -- "$4"
+	echo "Adding $4"
+	git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
+		exec git-checkout-cache -u -f -- "$4"
 	;;
 
 #
@@ -56,11 +46,9 @@ case "${1:-.}${2:-.}${3:-.}" in
 		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-cat-file blob "$2" >"$4" &&
-		chmod $mode -- "$4" &&
-		git-update-cache --add -- "$4"
+	echo "Adding $4"
+	git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
+		exec git-checkout-cache -u -f -- "$4"
 	;;
 
 #
@@ -69,28 +57,26 @@ case "${1:-.}${2:-.}${3:-.}" in
 "$1$2$3")
 	echo "Auto-merging $4."
 	orig=`git-unpack-file $1`
-	src1=`git-unpack-file $2`
 	src2=`git-unpack-file $3`
 
-	merge -p "$src1" "$orig" "$src2" > "$4"
+	# We reset the index to the first branch, making
+	# git-diff-file useful
+	git-update-cache --add --cacheinfo "$6" "$2" "$4"
+		git-checkout-cache -u -f -- "$4" &&
+		merge "$4" "$orig" "$src2"
 	ret=$?
-	rm -f -- "$orig" "$src1" "$src2"
+	rm -f -- "$orig" "$src2"
 
 	if [ "$6" != "$7" ]; then
 		echo "ERROR: Permissions conflict: $5->$6,$7."
 		ret=1
 	fi
-	case "$6" in *7??) mode=+x;; *) mode=-x;; esac
-	chmod "$mode" "$4"
 
 	if [ $ret -ne 0 ]; then
-		# Reset the index to the first branch, making
-		# git-diff-file useful
-		git-update-cache --add --cacheinfo "$6" "$2" "$4"
 		echo "ERROR: Merge conflict in $4."
 		exit 1
 	fi
-	exec git-update-cache --add -- "$4"
+	exec git-update-cache -- "$4"
 	;;
 
 *)