diff options
| author | Philippe Bruhat (BooK <book@cpan.org> | 2008-02-28 11:18:21 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-01 00:55:38 -0800 |
| commit | fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75 (patch) | |
| tree | 7dd28017699d1dab4dbf0d7f4ca1fb624543a392 /git-cvsimport.perl | |
| parent | b75bb1d695b0958d77b7894fa4a7dbc76167b65a (diff) | |
| download | git-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.tar.gz git-fbbbc362ab9d3a8d76eb4273e65fb1fb26849d75.tar.xz | |
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: Philippe Bruhat (BooK) <book@cpan.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-cvsimport.perl')
| -rwxr-xr-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 951624233..3d013a7d6 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -164,7 +164,7 @@ if ($#ARGV == 0) { 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/); |