summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2007-11-03 11:55:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-04 04:31:22 (GMT)
commita0554224a285b73b87fe1c95dbdff469561b182f (patch)
treedc70e509da2467da8d4c61bfeb826f5910a9d02c /git-cvsimport.perl
parentf45e867b1a60a2023c18719888bb52965ade7192 (diff)
downloadgit-a0554224a285b73b87fe1c95dbdff469561b182f.zip
git-a0554224a285b73b87fe1c95dbdff469561b182f.tar.gz
git-a0554224a285b73b87fe1c95dbdff469561b182f.tar.bz2
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl1
1 files changed, 1 insertions, 0 deletions
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 @@ while (<CVS>) {
$state = 4;
} elsif ($state == 4 and s/^Branch:\s+//) {
s/\s+$//;
+ tr/_/\./ if ( $opt_u );
s/[\/]/$opt_s/g;
$branch = $_;
$state = 5;