From: Gerrit Pape <pape@smarden.org>
Date: Sat, 3 Nov 2007 11:55:02 +0000 (+0000)
Subject: git-cvsimport: really convert underscores in branch names to dots with -u
X-Git-Tag: v1.5.3.6~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0554224a285b73b87fe1c95dbdff469561b182f;p=git.git

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>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2954fb846..e4bc2b54f 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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;