Skip to content

Commit

Permalink
Generate tags with correct timestamp (git-svnimport)
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Dave O'Neill authored and Junio C Hamano committed Jun 23, 2007
1 parent 6762079 commit 47ee8ed
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 24 deletions.
1 change: 0 additions & 1 deletion git-cvsimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
26 changes: 3 additions & 23 deletions git-svnimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -867,34 +867,14 @@ sub commit {
or die "Cannot write branch $dest for update: $!\n";
}

if($tag) {
my($in, $out) = ('','');
if ($tag) {
$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;
}
Expand Down

0 comments on commit 47ee8ed

Please sign in to comment.