[PATCH 6/7] Fix an error when a svn revision consists only of the creation of a new tag
From: Yaacov Akiba Slama <hidden>
Date: 2016-06-15 22:42:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <redacted> --- git-svnimport.perl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) applies-to: 12064f4a47217c44cc28ffb5977ffcd245179b5f f8f37463ee4c3b24249192345f81a16c0dd74f66
diff --git a/git-svnimport.perl b/git-svnimport.perl
index ae82a7c..e97f470 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".
--- 0.99.9.GIT