Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index ba23eb8eebdb841139062d4221c87515b96d8729..2954fb846e3372a648124d92b7c1a1ccbd44306f 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;