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

book · gitster · commit fbbbc362ab9d · 2008-03-01T00:55:38.000-08:00
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) &lt;book@cpan.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
@@ -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/);

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ sub read_repo_config {`
`164`	`164`
`165`	`165`	`our @mergerx = ();`
`166`	`166`	`if ($opt_m) {`
`167`		`- @mergerx = ( qr/\b(?:from\|of\|merge\|merging\|merged) (\w+)/i );`
	`167`	`+ @mergerx = ( qr/\b(?:from\|of\|merge\|merging\|merged) ([-\w]+)/i );`
`168`	`168`	`}`
`169`	`169`	`if ($opt_M) {`
`170`	`170`	`push (@mergerx, qr/$opt_M/);`