Skip to content

Commit ee834cf

Browse files
Michael Smithgitster
authored andcommitted
(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>
1 parent 451e593 commit ee834cf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

git-cvsimport.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ sub commit {
779779
$xtag =~ tr/_/\./ if ( $opt_u );
780780
$xtag =~ s/[\/]/$opt_s/g;
781781

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

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

git-svnimport.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ sub commit {
873873

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

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

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

0 commit comments

Comments
 (0)