Merge branch 'ep/cvstag'

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

diff --combined git-cvsimport.perl
index 3225a2a25dcaabbae64754e99a550f5b210f3765,524c9bb48787965f328613a269a28dc6d645abf4..75d65d414eca55970cb6ad3d3fe89c3a73f3c741
--- 1/git-cvsimport.perl
--- 2/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;
        }