undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport: have default merge regex also match beginning of commit message

Browse Source 
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>
This commit is contained in:
Gerrit Pape 2008-02-07 09:36:10 +00:00 committed by Junio C Hamano
parent 846688726c
commit 9386ecbb1c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-cvsimport.perl
View File

@ -164,7 +164,7 @@ if ($#ARGV == 0) {
our @mergerx = (); our @mergerx = ();
if ($opt_m) { if ($opt_m) {
@mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i ); @mergerx = ( qr/\b(?:from|of|merge|merging|merged) (\w+)/i );
} }
if ($opt_M) { if ($opt_M) {
push (@mergerx, qr/$opt_M/); push (@mergerx, qr/$opt_M/);