{"thread":{"id":"11813","subject":"[PATCH] cvsimport: have default merge regex also match beginning of commit message","startedAt":"2008-02-01T13:15:14Z","lastAt":"2008-02-07T09:36:10Z","messageCount":2,"participants":["Gerrit Pape"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"67028","messageId":"20080201131514.1979.qmail@4264665dc6742b.315fe32.mid.smarden.org","threadId":"11813","inReplyTo":null,"subject":"[PATCH] cvsimport: have default merge regex also match beginning of commit message","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2008-02-01T13:15:14Z","receivedAt":"2008-02-01T13:15:14Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"The default value of @mergerx uses \\W, which matches a non-word\ncharacter; this means that commit messages like \"Merging FOO\" are not\nmatched by default; using \\b, which matches a word boundary, instead of\n\\W fixes that.\n\nThis change was suggested by Fr�d�ric Bri�re through\n http://bugs.debian.org/463468\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n git-cvsimport.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 5694978..9516242 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -164,7 +164,7 @@ if ($#ARGV == 0) {\n \n our @mergerx = ();\n if ($opt_m) {\n-\t@mergerx = ( qr/\\W(?:from|of|merge|merging|merged) (\\w+)/i );\n+\t@mergerx = ( qr/\\b(?:from|of|merge|merging|merged) (\\w+)/i );\n }\n if ($opt_M) {\n \tpush (@mergerx, qr/$opt_M/);\n-- \n1.5.3.8\n"},{"id":"67773","messageId":"20080207093610.13624.qmail@82d44ea3a00d55.315fe32.mid.smarden.org","threadId":"11813","inReplyTo":"20080201131514.1979.qmail@4264665dc6742b.315fe32.mid.smarden.org","subject":"[PATCH/resend] cvsimport: have default merge regex also match beginning of commit message","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2008-02-07T09:36:10Z","receivedAt":"2008-02-07T09:36:10Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"The default value of @mergerx uses \\W, which matches a non-word\ncharacter; this means that commit messages like \"Merging FOO\" are not\nmatched by default; using \\b, which matches a word boundary, instead of\n\\W fixes that.\n\nThis change was suggested by Fr�d�ric Bri�re through\n http://bugs.debian.org/463468\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n git-cvsimport.perl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 5694978..9516242 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -164,7 +164,7 @@ if ($#ARGV == 0) {\n \n our @mergerx = ();\n if ($opt_m) {\n-\t@mergerx = ( qr/\\W(?:from|of|merge|merging|merged) (\\w+)/i );\n+\t@mergerx = ( qr/\\b(?:from|of|merge|merging|merged) (\\w+)/i );\n }\n if ($opt_M) {\n \tpush (@mergerx, qr/$opt_M/);\n-- \n1.5.4\n"}]}