undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle a revision that only creates a new tag correctly.

Browse Source 
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>
This commit is contained in:
Yaacov Akiba Slama 2005-11-02 23:51:57 +02:00 committed by Junio C Hamano
parent 109fc2b97b
commit a16db4f472
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-svnimport.perl
View File

@ -648,6 +648,10 @@ sub commit {
die "Error running git-commit-tree: $?\n" if $?; die "Error running git-commit-tree: $?\n" if $?;
} }
if (not defined $cid) {
$cid = $branches{"/"}{"LAST"};
}
if(not defined $dest) { if(not defined $dest) {
print "... no known parent\n" if $opt_v; print "... no known parent\n" if $opt_v;
} elsif(not $tag) { } elsif(not $tag) {
@ -664,6 +668,7 @@ sub commit {
# the tag was 'complex', i.e. did not refer to a "real" revision # the tag was 'complex', i.e. did not refer to a "real" revision
$dest =~ tr/_/\./ if $opt_u; $dest =~ tr/_/\./ if $opt_u;
$branch = $dest;
my $pid = open2($in, $out, 'git-mktag'); my $pid = open2($in, $out, 'git-mktag');
print $out ("object $cid\n". print $out ("object $cid\n".