X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file.sh;h=9a049f426d1ad9ed268877e3bda917ee9cc8f315;hb=ce3ca275452cf069eb6451d6f5b0f424a6f046aa;hp=739a07292afad6baf5b0a34ff1405eb2c90f5825;hpb=c639a5548a5d8414b55202592885449f66ee2f33;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 739a0729..9a049f42 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -26,7 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	fi
 	if test -f "$4"; then
 		rm -f -- "$4" &&
-		rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null
+		rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
 	fi &&
 		exec git-update-index --remove -- "$4"
 	;;