From: Gerrit Pape Date: Thu, 07 Feb 2008 09:36:10 GMT Subject: [PATCH/resend] cvsimport: have default merge regex also match beginning of commit message Message-ID: <20080207093610.13624.qmail@82d44ea3a00d55.315fe32.mid.smarden.org> In-Reply-To: <20080201131514.1979.qmail@4264665dc6742b.315fe32.mid.smarden.org> 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 --- git-cvsimport.perl | 2 +- 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/); -- 1.5.4