summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJoe English <jenglish@flightlab.com>2006-01-06 20:52:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-06 22:27:47 (GMT)
commit34c99da2a4324e9b4a9d3f59e8cd7114090bd22a (patch)
tree82c467c0aebe6facc0858efde76dab56e7fad93d /git-cvsimport.perl
parent576cfc86fc321688aec0bc7359fb1097e5717631 (diff)
downloadgit-34c99da2a4324e9b4a9d3f59e8cd7114090bd22a.zip
git-34c99da2a4324e9b4a9d3f59e8cd7114090bd22a.tar.gz
git-34c99da2a4324e9b4a9d3f59e8cd7114090bd22a.tar.bz2
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>
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 08a890c..8619e7d 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".