From: Philippe Bruhat (BooK <book@cpan.org>
Date: Thu, 28 Feb 2008 10:18:21 +0000 (+0100)
Subject: cvsimport: have default merge regex allow for dashes in the branch name
X-Git-Tag: v1.5.5-rc0~87^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75;p=git.git

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

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 951624233..3d013a7d6 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/);