[PATCH] cvsimport: have default merge regex allow for dashes in the branch name

Philippe Bruhat (BooK)· Feb 21, 2008, 10:48 UTC · lore

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>
---
 git-cvsimport.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-cvsimport.perl +1 −1

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/);

-- 
1.5.3.8

patchcvsimport: have default merge regex allow for dashes in the branch name