Subject: [PATCH 3/3] git-svn: fix svn fetch erroneously recreating empty dir placeholder deleted earlier, try #2

From: Ilya Basin <[email-masked]>
Date: Mon, 29 Apr 2013 00:11:02 +0400

The Fetcher accumulates deleted paths in an array and doesn't reset the
array on next commit. This causes different results when interrupting
and resuming the fetch.
When --preserve-empty-dirs flag is used, a path in the array can be
erroneously treated as just deleted (although it was deleted in the
previous commit) and cause the creation of an empty dir placeholder.
---
 perl/Git/SVN/Fetcher.pm                |  1 +
 t/t9160-git-svn-preserve-empty-dirs.sh | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
index 4f96076..e658889 100644
--- a/perl/Git/SVN/Fetcher.pm
+++ b/perl/Git/SVN/Fetcher.pm
@@ -19,6 +19,7 @@ sub new {
 	my ($class, $git_svn, $switch_path) = @_;
 	my $self = SVN::Delta::Editor->new;
 	bless $self, $class;
+	@deleted_gpath = ();
 	if (exists $git_svn->{last_commit}) {
 		$self->{c} = $git_svn->{last_commit};
 		$self->{empty_symlinks} =
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 43b1852..d50314d 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -15,18 +15,27 @@ say 'define NO_SVN_TESTS to skip git svn tests'
 GIT_REPO=git-svn-repo
 
 test_expect_success 'initialize source svn repo containing empty dirs' '
+	#exec 1>/dev/tty 2>&1
 	svn_cmd mkdir -m x "$svnrepo"/trunk &&
 	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
 	(
 		cd "$SVN_TREE" &&
-		mkdir -p 1 2 3/a 3/b 4 5 6 &&
+		mkdir -p 1 2 3/a 3/b 4 5 6 7 &&
 		echo "First non-empty file"  > 2/file1.txt &&
 		echo "Second non-empty file" > 2/file2.txt &&
 		echo "Third non-empty file"  > 3/a/file1.txt &&
 		echo "Fourth non-empty file" > 3/b/file1.txt &&
-		svn_cmd add 1 2 3 4 5 6 &&
+		echo "x" > 7/file.txt &&
+		svn_cmd add 1 2 3 4 5 6 7 &&
 		svn_cmd commit -m "initial commit" &&
 
+		svn_cmd del 7/file.txt &&
+		svn_cmd commit -m "delete last entry in directory" &&
+		svn_cmd up &&
+
+		svn_cmd del 7 &&
+		svn_cmd commit -m "delete empty dir that had files in it; subsequent commits should not recreate it" &&
+
 		mkdir 4/a &&
 		svn_cmd add 4/a &&
 		svn_cmd commit -m "nested empty directory" &&
@@ -60,6 +69,11 @@ test_expect_success 'clone svn repo with --preserve-empty-dirs --stdlayout' '
 	git svn clone "$svnrepo" --preserve-empty-dirs --stdlayout "$GIT_REPO"
 '
 
+# "$GIT_REPO"/7/ should not be recreated
+test_expect_success 'no recreating empty dir deleted earlier' '
+	test_must_fail test -d "$GIT_REPO"/7/
+'
+
 # "$GIT_REPO"/1 should only contain the placeholder file.
 test_expect_success 'directory empty from inception' '
 	test -f "$GIT_REPO"/1/.gitignore &&
-- 
1.8.1.5