X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-cvsimport.perl;h=7e95fb3740cb631d65c1a0bf07a78e2f75324210;hb=1f7903a371f90f025cfc3b4aa3a0b4a8f8b05b94;hp=bdac5d51b6dfb721bb648e455cb8f3c5078217e4;hpb=380a7426794dcad369dd48519cd01d6e0246cde5;p=git.git diff --git a/git-cvsimport.perl b/git-cvsimport.perl index bdac5d51b..7e95fb374 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -227,6 +227,7 @@ sub conn { $proxyport = $1; } } + $repo ||= '/'; # if username is not explicit in CVSROOT, then use current user, as cvs would $user=(getlogin() || $ENV{'LOGNAME'} || $ENV{'USER'} || "anonymous") unless $user; @@ -780,6 +781,7 @@ sub commit { $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** $xtag =~ tr/_/\./ if ( $opt_u ); $xtag =~ s/[\/]/$opt_s/g; + $xtag =~ s/\[//g; system('git-tag', '-f', $xtag, $cid) == 0 or die "Cannot create tag $xtag: $!\n"; @@ -950,7 +952,7 @@ while () { } elsif (/^-+$/) { # end of unknown-line processing $state = 1; } elsif ($state != 11) { # ignore stuff when skipping - print "* UNKNOWN LINE * $_\n"; + print STDERR "* UNKNOWN LINE * $_\n"; } } commit() if $branch and $state != 11;