glossary: explain "master" and "origin"

[git.git] / git-cvsimport.perl

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index efe1934..8619e7d 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -502,7 +502,7 @@ unless($pid) {
        if ($opt_P) {
            exec("cat", $opt_P);
        } else {
-           exec("cvsps",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
+           exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree);
            die "Could not start cvsps: $!\n";
        }
 }
@@ -649,6 +649,7 @@ my $commit = sub {
                my($xtag) = $tag;
                $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
                $xtag =~ tr/_/\./ if ( $opt_u );
+               $xtag =~ s/[\/]/$opt_s/g;
                
                my $pid = open2($in, $out, 'git-mktag');
                print $out "object $cid\n".