From: Junio C Hamano <junkio@cox.net>
Date: Sun, 20 Nov 2005 03:50:44 +0000 (-0800)
Subject: merge-one-file: remove empty directories
X-Git-Tag: v0.99.9k^2~69
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=397c76697f898e0341699fba8ef783f3342329c7;p=git.git

merge-one-file: remove empty directories

When the last file in a directory is removed as the result of a
merge, try to rmdir the now-empty directory.

[jc: We probably could use "rmdir -p", but for now we do that by
hand for portability.]

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

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index b08597de2..b285990fb 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"
 	;;