Browse Source

(cvs|svn)import: Ask git-tag to overwrite old tags.

If the tag was moved in CVS or SVN history, it will be moved in the
imported history as well. Tag history is not tracked.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Smith 18 years ago committed by Junio C Hamano
parent
commit
ee834cf0c7
  1. 2
      git-cvsimport.perl
  2. 2
      git-svnimport.perl

2
git-cvsimport.perl

@ -779,7 +779,7 @@ sub commit {
$xtag =~ tr/_/\./ if ( $opt_u ); $xtag =~ tr/_/\./ if ( $opt_u );
$xtag =~ s/[\/]/$opt_s/g; $xtag =~ s/[\/]/$opt_s/g;


system('git-tag', $xtag, $cid) == 0 system('git-tag', '-f', $xtag, $cid) == 0
or die "Cannot create tag $xtag: $!\n"; or die "Cannot create tag $xtag: $!\n";


print "Created tag '$xtag' on '$branch'\n" if $opt_v; print "Created tag '$xtag' on '$branch'\n" if $opt_v;

2
git-svnimport.perl

@ -873,7 +873,7 @@ sub commit {


$dest =~ tr/_/\./ if $opt_u; $dest =~ tr/_/\./ if $opt_u;


system('git-tag', $dest, $cid) == 0 system('git-tag', '-f', $dest, $cid) == 0
or die "Cannot create tag $dest: $!\n"; or die "Cannot create tag $dest: $!\n";


print "Created tag '$dest' on '$branch'\n" if $opt_v; print "Created tag '$dest' on '$branch'\n" if $opt_v;

Loading…
Cancel
Save