[PATCH] Generate tags with correct timestamp (git-svnimport)
- From
- Dave O'Neill <dmo@roaringpenguin.com>
- Date
- Jun 21, 2007, 21:48 UTC
- Message-ID
- <11824625361092-git-send-email-dmo@roaringpenguin.com>
- In-Reply-To
- <7vzm2u3tov.fsf@assigned-by-dhcp.pobox.com>
Now uses git-tag instead of manually constructing the tag. This gives us a correct timestamp, removes some crufty code, and makes it work the same as git-cvsimport.
The generated tags are now lightweight tags instead of tag objects, which may or may not be the behaviour we want.
Also, remove two unused variables from git-cvsimport. --- git-cvsimport.perl | 1 - git-svnimport.perl | 24 ++---------------------- 2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 433b7fd..69ccb88 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -774,7 +774,6 @@ sub commit { or die "Cannot write branch $branch for update: $!\n"; if ($tag) { - my ($in, $out) = ('',''); my ($xtag) = $tag; $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** $xtag =~ tr/_/\./ if ( $opt_u ); diff --git a/git-svnimport.perl b/git-svnimport.perl index f459762..32832ad 100755 --- a/git-svnimport.perl +++ b/git-svnimport.perl @@ -868,33 +868,13 @@ sub commit { } if($tag) { - my($in, $out) = ('',''); $last_rev = "-" if %$changed_paths; # 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". - "type commit\n". - "tag $dest\n". - "tagger $committer_name <$committer_email> 0 +0000\n") and - close($out) - or die "Cannot create tag object $dest: $!\n"; - - my $tagobj = <$in>; - chomp $tagobj; - - if ( !close($in) or waitpid($pid, 0) != $pid or - $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) { - die "Cannot create tag object $dest: $!\n"; - } - open(C,">$git_dir/refs/tags/$dest") and - print C ("$tagobj\n") and - close(C) - or die "Cannot create tag $branch: $!\n"; + system('git-tag', $dest, $cid) == 0 + or die "Cannot create tag $dest: $!\n"; print "Created tag '$dest' on '$branch'\n" if $opt_v; }
-- 1.5.2.2.239.g89630