{"thread":{"id":"43807","subject":"[PATCH] cvsimport: have default merge regex allow for dashes in the branch name","startedAt":"2008-02-21T10:48:56Z","lastAt":"2008-02-21T10:48:56Z","messageCount":1,"participants":["Philippe Bruhat (BooK)"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"299029","messageId":"1203590936-25827-1-git-send-email-book@cpan.org","threadId":"43807","inReplyTo":null,"subject":"[PATCH] cvsimport: have default merge regex allow for dashes in the branch name","fromName":"Philippe Bruhat (BooK)","fromEmail":"book@cpan.org","sentAt":"2008-02-21T10:48:56Z","receivedAt":"2008-02-21T10:48:56Z","isPatch":true,"sender":{"key":"book@cpan.org","avatar":"https://avatars.githubusercontent.com/u/44421?v=4"},"body":"The default value of @mergerx uses \\w, which matches word\ncharacter; a branch name like policy-20050608-br will not be\nmatched.\n\nSigned-off-by: Philippe Bruhat (BooK) <book@cpan.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 9516242..3d013a7 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/\\b(?: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\n"}]}