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>
Philippe Bruhat (BooK committed
Feb 28, 2008 at 11:18 UTC
fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75
1 file changed
+1
-1
git-cvsimport.perl
+1
-1
@@ -164,7 +164,7 @@ if ($#ARGV == 0) {
164
165
our @mergerx = ();
166
if ($opt_m) {
167
- @mergerx = ( qr/\b(?:from|of|merge|merging|merged) (\w+)/i );
167
+ @mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
168
}
169
if ($opt_M) {
170
push (@mergerx, qr/$opt_M/);