git svn: strip leading path when making empty dirs

Eric Wong · Eric Wong · commit 9be30eed6199 · 2009-11-22T18:15:42.000-08:00
Since unhandled.log stores paths relative to the repository
root, we need to strip out leading path components if the
directories we're tracking are not the repository root.

Reported-by: Björn Steinbrink
Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/git-svn.perl b/git-svn.perl
@@ -2752,8 +2752,11 @@ sub mkemptydirs {
 		}
 	}
 	close $fh;
+
+	my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
 	foreach my $d (sort keys %empty_dirs) {
 		$d = uri_decode($d);
+		$d =~ s/$strip//;
 		next if -d $d;
 		if (-e _) {
 			warn "$d exists but is not a directory\n";
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
@@ -82,4 +82,27 @@ test_expect_success 'git svn mkdirs -r works' '
 	)
 '
 
+test_expect_success 'initialize trunk' '
+	for i in trunk trunk/a trunk/"weird file name"
+	do
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+	done
+'
+
+test_expect_success 'clone trunk' 'git svn clone -s "$svnrepo" trunk'
+
+test_expect_success 'empty directories in trunk exist' '
+	(
+		cd trunk &&
+		for i in a "weird file name"
+		do
+			if ! test -d "$i"
+			then
+				echo >&2 "$i does not exist"
+				exit 1
+			fi
+		done
+	)
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -2752,8 +2752,11 @@ sub mkemptydirs {`
`2752`	`2752`	`}`
`2753`	`2753`	`}`
`2754`	`2754`	`close $fh;`
	`2755`	`+`
	`2756`	`+ my $strip = qr/\A\Q$self->{path}\E(?:\/\|$)/;`
`2755`	`2757`	`foreach my $d (sort keys %empty_dirs) {`
`2756`	`2758`	`$d = uri_decode($d);`
	`2759`	`+ $d =~ s/$strip//;`
`2757`	`2760`	`next if -d $d;`
`2758`	`2761`	`if (-e _) {`
`2759`	`2762`	`warn "$d exists but is not a directory\n";`