X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge-one-file.sh;h=b285990fb24f8a2a3dc96e27af67b6afbac024c7;hb=7b8999674955b9d6b58de2b8f71b2e2ede795f65;hp=b08597de29afc6bc1aaddf7b817bc122cd517b04;hpb=3eeb419968c1f8f0a762a7127db770e9d9c8037d;p=git.git

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