git-merge-one-file: do not worry about 'rmdir -p' not removing directory.
authorJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 01:02:04 +0000 (17:02 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 2 Dec 2005 01:02:04 +0000 (17:02 -0800)
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>
git-merge-one-file.sh
index 739a07292afad6baf5b0a34ff1405eb2c90f5825..9a049f426d1ad9ed268877e3bda917ee9cc8f315 100755 (executable)
@@ -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"
        ;;