提交 fbbbc362 编写于 作者: P Philippe Bruhat (BooK 提交者: Junio C Hamano

cvsimport: have default merge regex allow for dashes in the branch name

The default value of @mergerx uses \w, which matches word
character; a branch name like policy-20050608-br will not be
matched.
Signed-off-by: NPhilippe Bruhat (BooK) <book@cpan.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 b75bb1d6
......@@ -164,7 +164,7 @@ sub read_repo_config {
our @mergerx = ();
if ($opt_m) {
@mergerx = ( qr/\b(?: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/);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册