X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge-one-file-script;h=b791107fd73c87361f340fc1b0a43e53cecd2a8e;hb=78938b0d8a95b09d94af214fdb6b5f053a5edb98;hp=9802f67032bde6bbd9edacb89f3a4acdf876deb9;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git

diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 9802f670..b791107f 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -21,12 +21,13 @@ case "${1:-.}${2:-.}${3:-.}" in
 # Deleted in both or deleted in one and unchanged in the other
 #
 "$1.." | "$1.$1" | "$1$1.")
-	echo "Removing $4"
-	if test -f "$4"
-	then
+	if [ "$2" ]; then
+		echo "Removing $4"
+	fi
+	if test -f "$4"; then
 		rm -f -- "$4"
 	fi &&
-	exec git-update-cache --remove -- "$4"
+		exec git-update-cache --remove -- "$4"
 	;;
 
 #
@@ -62,7 +63,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 
 	# We reset the index to the first branch, making
 	# git-diff-file useful
-	git-update-cache --add --cacheinfo "$6" "$2" "$4" 
+	git-update-cache --add --cacheinfo "$6" "$2" "$4"
 		git-checkout-cache -u -f -- "$4" &&
 		merge "$4" "$orig" "$src2"
 	ret=$?