summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaacov Akiba Slama <ya@slamail.org>2005-11-02 21:51:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-08 09:24:48 (GMT)
commitc2c07a5c2adf2aebc19b04a608592489b156a8bb (patch)
tree3776058dd63aa9163e39d7ce5c7d510e386653c3
parentcbce5d8961f7790a621f7cee6ecb2c25ae372867 (diff)
downloadgit-c2c07a5c2adf2aebc19b04a608592489b156a8bb.zip
git-c2c07a5c2adf2aebc19b04a608592489b156a8bb.tar.gz
git-c2c07a5c2adf2aebc19b04a608592489b156a8bb.tar.bz2
Don't output error on changes in the nodes /, /tags or /branches
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-svnimport.perl7
1 files changed, 6 insertions, 1 deletions
diff --git a/git-svnimport.perl b/git-svnimport.perl
index 83b70f9..ea5bbdb 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -336,7 +336,12 @@ sub split_path($$) {
} elsif($path =~ s#^/\Q$branch_name\E/([^/]+)/?##) {
$branch = $1;
} else {
- print STDERR "$rev: Unrecognized path: $path\n";
+ my %no_error = (
+ "/" => 1,
+ "/$tag_name" => 1,
+ "/$branch_name" => 1
+ );
+ print STDERR "$rev: Unrecognized path: $path\n" unless (defined $no_error{$path});
return ()
}
$path = "/" if $path eq "";