From: Junio C Hamano <junkio@cox.net>
Date: Fri, 2 Dec 2005 01:02:04 +0000 (-0800)
Subject: git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
X-Git-Tag: v0.99.9l^2~16
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=ce3ca275452cf069eb6451d6f5b0f424a6f046aa

git-merge-one-file: do not worry about 'rmdir -p' not removing directory.

9ae2172aed289f2706a0e88288909fa47eddd7e7 used "rmdir -p"
carelessly, causing the more important "git-update-index
--remove" to be skipped.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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"
 	;;