summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-02-07 09:36:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-13 22:22:54 (GMT)
commit9386ecbb1cb0576f67da804f57dd96ffd62bb3c6 (patch)
treeac8bc4c103296e905c205bff998671b4be490595 /git-cvsimport.perl
parent846688726c388cf7fc92ac5cc9f3576e93847e15 (diff)
downloadgit-9386ecbb1cb0576f67da804f57dd96ffd62bb3c6.zip
git-9386ecbb1cb0576f67da804f57dd96ffd62bb3c6.tar.gz
git-9386ecbb1cb0576f67da804f57dd96ffd62bb3c6.tar.bz2
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 5694978..9516242 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/);