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) <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242338d95687b4354a6d21692cbd10547899..3d013a7d622fbf383ffab2904d34584e8107f085 100755 (executable)
--- 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/);