cvsimport: have default merge regex also match beginning of commit message
The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Gerrit Pape committed
Feb 7, 2008 at 09:36 UTC
9386ecbb1cb0576f67da804f57dd96ffd62bb3c6
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/\W(?: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/);