* [PATCH] cvsimport: have default merge regex allow for dashes in the branch name
@ 2008-02-21 10:48 Philippe Bruhat (BooK)
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-21 10:48 UTC (permalink / raw)
To: git, philippe.bruhat; +Cc: gitster, Philippe Bruhat (BooK)
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>
---
git-cvsimport.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242..3d013a7 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/);
--
1.5.3.8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] cvsimport: have default merge regex allow for dashes in the branch name
2008-02-28 10:18 Multiple -M options for git-cvsimport Philippe Bruhat (BooK)
@ 2008-02-28 10:18 ` Philippe Bruhat (BooK)
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Bruhat (BooK) @ 2008-02-28 10:18 UTC (permalink / raw)
To: git; +Cc: gitster, Philippe Bruhat (BooK
From: Philippe Bruhat (BooK <book@cpan.org>
The default value of @mergerx uses \w, which matches word
character; a branch name like policy-20050608-br will not be
matched.
---
git-cvsimport.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242..3d013a7 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/);
--
1.5.4.2.187.gfc276
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-02-28 10:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-21 10:48 [PATCH] cvsimport: have default merge regex allow for dashes in the branch name Philippe Bruhat (BooK)
-- strict thread matches above, loose matches on Subject: below --
2008-02-28 10:18 Multiple -M options for git-cvsimport Philippe Bruhat (BooK)
2008-02-28 10:18 ` [PATCH] cvsimport: have default merge regex allow for dashes in the branch name Philippe Bruhat (BooK)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).