summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 109fc2b)
raw | patch | inline | side by side (parent: 109fc2b)
author | Yaacov Akiba Slama <ya@slamail.org> | |
Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 8 Nov 2005 09:24:49 +0000 (01:24 -0800) |
Fix an error when a svn revision consists only of the creation of a new tag
directory (/tags/this_is_a_tag).
Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
directory (/tags/this_is_a_tag).
Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-svnimport.perl | patch | blob | history |
diff --git a/git-svnimport.perl b/git-svnimport.perl
index ae82a7c0970e9fcea2d510a5e382be45908a6cf1..e97f47059fda6cf058e43f2b77ff784ed2b5ee13 100755 (executable)
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
die "Error running git-commit-tree: $?\n" if $?;
}
+ if (not defined $cid) {
+ $cid = $branches{"/"}{"LAST"};
+ }
+
if(not defined $dest) {
print "... no known parent\n" if $opt_v;
} elsif(not $tag) {
# the tag was 'complex', i.e. did not refer to a "real" revision
$dest =~ tr/_/\./ if $opt_u;
+ $branch = $dest;
my $pid = open2($in, $out, 'git-mktag');
print $out ("object $cid\n".