diff options
| author |  Gerrit Pape <pape@smarden.org> | 2008-02-07 09:36:10 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-02-13 14:22:54 -0800 |
| commit | 9386ecbb1cb0576f67da804f57dd96ffd62bb3c6 (patch) | |
| tree | ac8bc4c103296e905c205bff998671b4be490595 | |
| parent | git clone -s documentation: force a new paragraph for the NOTE (diff) | |
| download | tgif-9386ecbb1cb0576f67da804f57dd96ffd62bb3c6.tar.xz | |
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>
| -rwxr-xr-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 5694978c46..9516242338 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -164,7 +164,7 @@ if ($#ARGV == 0) { our @mergerx = (); 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) { push (@mergerx, qr/$opt_M/); |