From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Jun 2007 04:01:27 +0000 (-0700)
Subject: Merge branch 'ep/cvstag'
X-Git-Tag: v1.5.3-rc0~111
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/03545396ef355f79c73de1ebcd9e22d3c9f5ade4?ds=inline;hp=-c

Merge branch 'ep/cvstag'

* ep/cvstag:
Use git-tag in git-cvsimport
---

03545396ef355f79c73de1ebcd9e22d3c9f5ade4
diff --combined git-cvsimport.perl
index 3225a2a25d,524c9bb487..75d65d414e
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@@ -145,7 -145,7 +145,7 @@@ my $cvs_tree
  if ($#ARGV == 0) {
  	$cvs_tree = $ARGV[0];
  } elsif (-f 'CVS/Repository') {
 -	open my $f, '<', 'CVS/Repository' or 
 +	open my $f, '<', 'CVS/Repository' or
  	    die 'Failed to open CVS/Repository';
  	$cvs_tree = <$f>;
  	chomp $cvs_tree;
@@@ -434,7 -434,7 +434,7 @@@ sub file 
  	my ($self,$fn,$rev) = @_;
  	my $res;
  
 -	my ($fh, $name) = tempfile('gitcvs.XXXXXX', 
 +	my ($fh, $name) = tempfile('gitcvs.XXXXXX',
  		    DIR => File::Spec->tmpdir(), UNLINK => 1);
  
  	$self->_file($fn,$rev) and $res = $self->_line($fh);
@@@ -520,8 -520,8 +520,8 @@@ sub is_sha1 
  
  sub get_headref ($$) {
      my $name    = shift;
 -    my $git_dir = shift; 
 -    
 +    my $git_dir = shift;
 +
      my $f = "$git_dir/refs/heads/$name";
      if (open(my $fh, $f)) {
  	    chomp(my $r = <$fh>);
@@@ -772,30 -772,8 +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;
  	}