git-cvsimport: really convert underscores in branch names to dots with -u
authorGerrit Pape <pape@smarden.org>
Sat, 3 Nov 2007 11:55:02 +0000 (11:55 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Nov 2007 04:31:22 +0000 (21:31 -0700)
The documentation states for the -u option that underscores in tag and
branch names are converted to dots, but this was actually implemented
for the tag names only.

Kurt Roeckx reported this through
 http://bugs.debian.org/446495

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-cvsimport.perl

index 2954fb846e3372a648124d92b7c1a1ccbd44306f..e4bc2b54f68930df217751975e32b4224f8d765c 100755 (executable)
@@ -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;