undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate tags with correct timestamp (git-svnimport)

Browse Source 
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>
This commit is contained in:
Dave O'Neill 2007-06-21 17:48:56 -04:00 committed by Junio C Hamano
parent 6762079a96
commit 47ee8ed292
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-cvsimport.perl
View File

@ -774,7 +774,6 @@ sub commit {
or die "Cannot write branch $branch for update: $!\n"; or die "Cannot write branch $branch for update: $!\n";
if ($tag) { if ($tag) {
my ($in, $out) = ('','');
my ($xtag) = $tag; my ($xtag) = $tag;
$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
$xtag =~ tr/_/\./ if ( $opt_u ); $xtag =~ tr/_/\./ if ( $opt_u );

26
git-svnimport.perl
View File

@ -867,34 +867,14 @@ sub commit {
or die "Cannot write branch $dest for update: $!\n"; or die "Cannot write branch $dest for update: $!\n";
} }
if($tag) { if ($tag) {
my($in, $out) = ('','');
$last_rev = "-" if %$changed_paths; $last_rev = "-" if %$changed_paths;
# the tag was 'complex', i.e. did not refer to a "real" revision # the tag was 'complex', i.e. did not refer to a "real" revision
$dest =~ tr/_/\./ if $opt_u; $dest =~ tr/_/\./ if $opt_u;
$branch = $dest;
my $pid = open2($in, $out, 'git-mktag'); system('git-tag', $dest, $cid) == 0
print $out ("object $cid\n". or die "Cannot create tag $dest: $!\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";
print "Created tag '$dest' on '$branch'\n" if $opt_v; print "Created tag '$dest' on '$branch'\n" if $opt_v;
} }