From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Mon, 14 Nov 2005 07:31:00 +0000 (+0100)
Subject: Remove trailing slashes
X-Git-Tag: v0.99.9i^2~8^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4b1ca25e429a67de4828c029b053dea637732722;p=git.git

Remove trailing slashes

SVN dies a messy death when passed a path with trailing slashes.
---

diff --git a/git-svnimport.perl b/git-svnimport.perl
index cb9afb95..af13fdd8 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -280,7 +280,8 @@ sub revert_split_path($$) {
 		$svnpath = "$branch_name/$branch/$path";
 	}
 
-	return $svnpath
+	$svnpath =~ s#/+$##;
+	return $svnpath;
 }
 
 sub get_file($$$) {
@@ -372,6 +373,10 @@ sub copy_path($$$$$$$$) {
 	my($newrev,$newbranch,$path,$oldpath,$rev,$node_kind,$new,$parents) = @_;
 
 	my($srcbranch,$srcpath) = split_path($rev,$oldpath);
+	unless(defined $srcbranch) {
+		print "Path not found when copying from $oldpath @ $rev\n";
+		return;
+	}
 	my $therev = branch_rev($srcbranch, $rev);
 	my $gitrev = $branches{$srcbranch}{$therev};
 	unless($gitrev) {