From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date: Tue, 24 Apr 2007 11:51:04 +0000 (+0200)
Subject: fix importing of subversion tars
X-Git-Tag: v1.5.2-rc1~32^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=46f6178a3f4e7a5bf8b47da0f3cc5c998d907ce8;p=git.git

fix importing of subversion tars

add a / between the prefix and name fields of the tar archive if prefix
is non-empty.

Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 5585a8b2c..184214689 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -64,7 +64,12 @@ foreach my $tar_file (@ARGV)
 		}
 		print FI "\n";
 
-		my $path = "$prefix$name";
+		my $path;
+		if ($prefix) {
+			$path = "$prefix/$name";
+		} else {
+			$path = "$name";
+		}
 		$files{$path} = [$next_mark++, $mode];
 
 		$commit_time = $mtime if $mtime > $commit_time;