X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file.sh;fp=git-merge-one-file.sh;h=c3eca8b3321df8dbf632fb687003737d8989d6f6;hb=9ae2172aed289f2706a0e88288909fa47eddd7e7;hp=b285990fb24f8a2a3dc96e27af67b6afbac024c7;hpb=13cfdfd5fade73c7784ec45506b446e40e76c742;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index b285990f..c3eca8b3 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -26,11 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	fi
 	if test -f "$4"; then
 		rm -f -- "$4" &&
-		dn="$4" &&
-		while dn=$(expr "$dn" : '\(.*\)/') && rmdir "$dn" 2>/dev/null
-		do
-			:;
-		done
+		rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null
 	fi &&
 		exec git-update-index --remove -- "$4"
 	;;