Do check_repository_format() early (re-fix)

[git.git] / git-cvsimport.perl

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index ba23eb8eebdb841139062d4221c87515b96d8729..e4bc2b54f68930df217751975e32b4224f8d765c 100755 (executable)
--- 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;