From a16db4f472887a9050bf528bc7f0b94d6f7e8319 Mon Sep 17 00:00:00 2001 From: Yaacov Akiba Slama Date: Wed, 2 Nov 2005 23:51:57 +0200 Subject: [PATCH] Handle a revision that only creates a new tag correctly. 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 Signed-off-by: Junio C Hamano --- git-svnimport.perl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git-svnimport.perl b/git-svnimport.perl index ae82a7c0..e97f4705 100755 --- a/git-svnimport.perl +++ b/git-svnimport.perl @@ -648,6 +648,10 @@ sub commit { 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) { @@ -664,6 +668,7 @@ sub commit { # 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". -- 2.11.0