X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=e1eb9632660146396a0b5f3f2a410d8cb027ff9d;hb=45e2b6140147d7a8b2cd68399e4d52d5d8d7b5be;hp=9ee3f804520eadb322de3d0ea70a2bf9f092b089;hpb=cd1bea918bde5b32cf29159acac067bd238825b3;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9ee3f8045..e1eb96326 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -48,10 +48,11 @@ case "${1:-.}${2:-.}${3:-.}" in
 	;;
 "..$3")
 	echo "Adding $4"
-	test -f "$4" || {
+	if test -f "$4"
+	then
 		echo "ERROR: untracked $4 is overwritten by the merge."
 		exit 1
-	}
+	fi
 	git update-index --add --cacheinfo "$7" "$3" "$4" &&
 		exec git checkout-index -u -f -- "$4"
 	;;