[PATCH] Make git-reset delete empty directories

From

Shawn Pearce <spearce@spearce.org>

Date

Feb 17, 2006, 07:26 UTC

Message-ID

<20060217072616.GA15358@spearce.org>

---

 git-reset.sh     |   17 ++++++++++++---
 t/t7101-reset.sh |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100755 t/t7101-reset.sh

diff --git a/git-reset.sh b/git-reset.sh
index fe53fc8065dc82c0054ba9891b28a00b0752bf87..8eac4640bc8dfb655f8429036b68644df027dea4 100755
--- a/git-reset.sh
+++ b/git-reset.sh
@@ -74,22 +74,33 @@ case "$reset_type" in
 	git-ls-files --cached -z |
 	perl -e '
 		use strict;
-		my (%keep, $fh);
+		my (%keep_file, %keep_dir, %rm_dir, $fh);
 		$/ = "\0";
 		while (<STDIN>) {
 			chomp;
-			$keep{$_} = 1;
+			$keep_file{$_} = 1;
+			while (s,/?[^/]+$,, && $_) {
+				last if $keep_dir{$_}++;
+			}
 		}
 		open $fh, "<", $ARGV[0]
 			or die "cannot open $ARGV[0]";
 		while (<$fh>) {
 			chomp;
-			if (! exists $keep{$_}) {
+			if (! exists $keep_file{$_}) {
 				# it is ok if this fails -- it may already
 				# have been culled by checkout-index.
 				unlink $_;
+				while (s,/?[^/]+$,, && $_ && !$keep_dir{$_}) {
+					last if $rm_dir{$_}++;
+				}
 			}
 		}
+		foreach (sort {length($b) <=> length($a)} keys %rm_dir) {
+			# it is ok if this fails -- it may have user files
+			# we do not track and thus should not delete.
+			rmdir $_;
+		}
 	' $tmp-exists
 	;;
 --soft )
diff --git a/t/t7101-reset.sh b/t/t7101-reset.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a9191407f21c748f4c00bf909f670fc2b5124ec3
--- /dev/null
+++ b/t/t7101-reset.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Shawn Pearce
+#
+
+test_description='git-reset should cull empty subdirs'
+. ./test-lib.sh
+
+test_expect_success \
+    'creating initial files' \
+    'mkdir path0 &&
+     cp ../../COPYING path0/COPYING &&
+     git-add path0/COPYING &&
+     git-commit -m add -a'
+
+test_expect_success \
+    'creating second files' \
+    'mkdir path1 &&
+     mkdir path1/path2 &&
+     cp ../../COPYING path1/path2/COPYING &&
+     cp ../../COPYING path1/COPYING &&
+     cp ../../COPYING COPYING &&
+     cp ../../COPYING path0/COPYING-TOO &&
+     git-add path1/path2/COPYING &&
+     git-add path1/COPYING &&
+     git-add COPYING &&
+     git-add path0/COPYING-TOO &&
+     git-commit -m change -a'
+
+test_expect_success \
+    'resetting tree HEAD^' \
+    'git-reset --hard HEAD^'
+
+test_expect_success \
+    'checking initial files exist after rewind' \
+    'test -d path0 &&
+     test -f path0/COPYING'
+
+test_expect_failure \
+    'checking lack of path1/path2/COPYING' \
+    'test -f path1/path2/COPYING'
+
+test_expect_failure \
+    'checking lack of path1/COPYING' \
+    'test -f path1/COPYING'
+
+test_expect_failure \
+    'checking lack of COPYING' \
+    'test -f COPYING'
+
+test_expect_failure \
+    'checking checking lack of path1/COPYING-TOO' \
+    'test -f path0/COPYING-TOO'
+
+test_expect_failure \
+    'checking lack of path1/path2' \
+    'test -d path1/path2'
+
+test_expect_failure \
+    'checking lack of path1' \
+    'test -d path1'
+
+test_done