From: Joe English <jenglish@flightlab.com>
Date: Fri, 6 Jan 2006 20:52:27 +0000 (-0800)
Subject: Substitute "/" with $opt_s in tag names as well as branch names
X-Git-Tag: v1.0.8^2~9
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=34c99da2a4324e9b4a9d3f59e8cd7114090bd22a;p=git.git

Substitute "/" with $opt_s in tag names as well as branch names

In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names,
but not in tag names, which is inconsistent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 08a890c2..8619e7d1 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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".