Git development
 help / color / mirror / Atom feed
* [PATCH 6/7] Fix an error when a svn revision consists only of the creation of a new tag
@ 2005-11-02 21:51 Yaacov Akiba Slama
  0 siblings, 0 replies; only message in thread
From: Yaacov Akiba Slama @ 2005-11-02 21:51 UTC (permalink / raw)


directory (/tags/this_is_a_tag).

Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>

---

 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2005-11-02 21:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-02 21:51 [PATCH 6/7] Fix an error when a svn revision consists only of the creation of a new tag Yaacov Akiba Slama

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox