mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
git-svnimport: Improved detection of merges.
The regexes detecting merges (while still relying on the commit messages, though) have been improved to catch saner (and hopefully more) messages. The old regex was so generic that it often matched something else and missed the actual merge-message. Also, the regex given with the `-M' commandline-option is checked first: Explicitely given regexes should be considered better than the builtin ones, and should therefore be given a chance to match a message first. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
1361fa3e49
commit
65160b8b04
|
@ -63,10 +63,17 @@ END
|
||||||
|
|
||||||
our @mergerx = ();
|
our @mergerx = ();
|
||||||
if ($opt_m) {
|
if ($opt_m) {
|
||||||
@mergerx = ( qr/\W(?:from|of|merge|merging|merged) (\w+)/i );
|
my $branch_esc = quotemeta ($branch_name);
|
||||||
|
my $trunk_esc = quotemeta ($trunk_name);
|
||||||
|
@mergerx =
|
||||||
|
(
|
||||||
|
qr!\b(?:merg(?:ed?|ing))\b.*?\b((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
|
||||||
|
qr!\b(?:from|of)\W+((?:(?<=$branch_esc/)[\w\.\-]+)|(?:$trunk_esc))\b!i,
|
||||||
|
qr!\b(?:from|of)\W+(?:the )?([\w\.\-]+)[-\s]branch\b!i
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if ($opt_M) {
|
if ($opt_M) {
|
||||||
push (@mergerx, qr/$opt_M/);
|
unshift (@mergerx, qr/$opt_M/);
|
||||||
}
|
}
|
||||||
|
|
||||||
# Absolutize filename now, since we will have chdir'ed by the time we
|
# Absolutize filename now, since we will have chdir'ed by the time we
|
||||||
|
|
Loading…
Reference in a new issue