git svn: log removals of empty directories

Eric Wong · Eric Wong · commit f9ad77a739c0 · 2009-12-07T20:49:44.000-08:00
This also adds a test case for:
  "git svn: Don't create empty directories whose parents were deleted"
which was the reason we found this bug in the first place.

Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -3891,11 +3891,11 @@ sub delete_entry {
 		}
 		print "\tD\t$gpath/\n" unless $::_q;
 		command_close_pipe($ls, $ctx);
-		$self->{empty}->{$path} = 0
 	} else {
 		$self->{gii}->remove($gpath);
 		print "\tD\t$gpath\n" unless $::_q;
 	}
+	$self->{empty}->{$path} = 0;
 	undef;
 }
 
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
@@ -105,4 +105,14 @@ test_expect_success 'empty directories in trunk exist' '
 	)
 '
 
+test_expect_success 'remove a top-level directory from svn' '
+	svn_cmd rm -m "remove d" "$svnrepo"/d
+'
+
+test_expect_success 'removed top-level directory does not exist' '
+	git svn clone "$svnrepo" removed &&
+	test ! -e removed/d
+
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -3891,11 +3891,11 @@ sub delete_entry {`
`3891`	`3891`	`}`
`3892`	`3892`	`print "\tD\t$gpath/\n" unless $::_q;`
`3893`	`3893`	`command_close_pipe($ls, $ctx);`
`3894`		`- $self->{empty}->{$path} = 0`
`3895`	`3894`	`} else {`
`3896`	`3895`	`$self->{gii}->remove($gpath);`
`3897`	`3896`	`print "\tD\t$gpath\n" unless $::_q;`
`3898`	`3897`	`}`
	`3898`	`+ $self->{empty}->{$path} = 0;`
`3899`	`3899`	`undef;`
`3900`	`3900`	`}`
`3901`	`3901`
Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,14 @@ test_expect_success 'empty directories in trunk exist' '`
`105`	`105`	`)`
`106`	`106`	`'`
`107`	`107`
	`108`	`+test_expect_success 'remove a top-level directory from svn' '`
	`109`	`+ svn_cmd rm -m "remove d" "$svnrepo"/d`
	`110`	`+'`
	`111`	`+`
	`112`	`+test_expect_success 'removed top-level directory does not exist' '`
	`113`	`+ git svn clone "$svnrepo" removed &&`
	`114`	`+ test ! -e removed/d`
	`115`	`+`
	`116`	`+'`
	`117`	`+`
`108`	`118`	`test_done`