summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-13 04:01:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-13 04:01:27 (GMT)
commit03545396ef355f79c73de1ebcd9e22d3c9f5ade4 (patch)
treec8700bcca678af277296fe5e57d084b82650be83 /git-cvsimport.perl
parentca6c097089a38d447de0190ea61e9746a40a170c (diff)
parent5c08931dfc9fa0acbf8667581e4c98d643e66dbe (diff)
downloadgit-03545396ef355f79c73de1ebcd9e22d3c9f5ade4.zip
git-03545396ef355f79c73de1ebcd9e22d3c9f5ade4.tar.gz
git-03545396ef355f79c73de1ebcd9e22d3c9f5ade4.tar.bz2
Merge branch 'ep/cvstag'
* ep/cvstag: Use git-tag in git-cvsimport
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl24
1 files changed, 1 insertions, 23 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3225a2a..75d65d4 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -772,30 +772,8 @@ sub commit {
$xtag =~ tr/_/\./ if ( $opt_u );
$xtag =~ s/[\/]/$opt_s/g;
- my $pid = open2($in, $out, 'git-mktag');
- print $out "object $cid\n".
- "type commit\n".
- "tag $xtag\n".
- "tagger $author_name <$author_email>\n"
- or die "Cannot create tag object $xtag: $!\n";
- close($out)
- or die "Cannot create tag object $xtag: $!\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 $xtag: $!\n";
- }
-
-
- open(C,">$git_dir/refs/tags/$xtag")
+ system('git-tag', $xtag, $cid) == 0
or die "Cannot create tag $xtag: $!\n";
- print C "$tagobj\n"
- or die "Cannot write tag $xtag: $!\n";
- close(C)
- or die "Cannot write tag $xtag: $!\n";
print "Created tag '$xtag' on '$branch'\n" if $opt_v;
}