commit a0554224a285b73b87fe1c95dbdff469561b182f
author Gerrit Pape <pape@smarden.org> Sat Nov 03 11:55:02 2007 +0000
committer Junio C Hamano <gitster@pobox.com> Sat Nov 03 21:31:22 2007 -0700
tree dc70e509da2467da8d4c61bfeb826f5910a9d02c
parent f45e867b1a60a2023c18719888bb52965ade7192

git-cvsimport: really convert underscores in branch names to dots with -u

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

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2954fb8..e4bc2b5 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -818,6 +818,7 @@
 		$state = 4;
 	} elsif ($state == 4 and s/^Branch:\s+//) {
 		s/\s+$//;
+		tr/_/\./ if ( $opt_u );
 		s/[\/]/$opt_s/g;
 		$branch = $_;
 		$state = 5;