From ee834cf0c7de68557bc5c30552fce3e55f52e109 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 7 Sep 2007 17:35:07 -0400 Subject: [PATCH] (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 --- git-cvsimport.perl | 2 +- git-svnimport.perl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index ba23eb8eeb..2954fb846e 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -779,7 +779,7 @@ sub commit { $xtag =~ tr/_/\./ if ( $opt_u ); $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"; print "Created tag '$xtag' on '$branch'\n" if $opt_v; diff --git a/git-svnimport.perl b/git-svnimport.perl index 8c17fb5ae2..d3ad5b904f 100755 --- a/git-svnimport.perl +++ b/git-svnimport.perl @@ -873,7 +873,7 @@ sub commit { $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"; print "Created tag '$dest' on '$branch'\n" if $opt_v; -- 2.11.4.GIT