summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Bruhat (BooK <book@cpan.org>2008-02-28 10:18:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-01 08:55:38 (GMT)
commitfbbbc362ab9d3a8d76eb4273e65fb1fb26849d75 (patch)
tree7dd28017699d1dab4dbf0d7f4ca1fb624543a392
parentb75bb1d695b0958d77b7894fa4a7dbc76167b65a (diff)
downloadgit-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.zip
git-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.tar.gz
git-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.tar.bz2
cvsimport: have default merge regex allow for dashes in the branch name
The default value of @mergerx uses \w, which matches word character; a branch name like policy-20050608-br will not be matched. Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242..3d013a7 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -164,7 +164,7 @@ if ($#ARGV == 0) {
our @mergerx = ();
if ($opt_m) {
- @mergerx = ( qr/\b(?:from|of|merge|merging|merged) (\w+)/i );
+ @mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
}
if ($opt_M) {
push (@mergerx, qr/$opt_M/);