X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-cvsimport.perl;h=e4bc2b54f68930df217751975e32b4224f8d765c;hb=fed1b5cac0cc3ae324dc004181a276ea16589951;hp=ba23eb8eebdb841139062d4221c87515b96d8729;hpb=71e55854fd6e5c9ce786bcd20efef43bd56f9df0;p=git.git

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index ba23eb8ee..e4bc2b54f 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;
@@ -818,6 +818,7 @@ while (<CVS>) {
 		$state = 4;
 	} elsif ($state == 4 and s/^Branch:\s+//) {
 		s/\s+$//;
+		tr/_/\./ if ( $opt_u );
 		s/[\/]/$opt_s/g;
 		$branch = $_;
 		$state = 5;