mirror of
https://github.com/git/git.git
synced 2026-01-17 22:26:32 +00:00
Meta/Reintegrate: omit everything after $willdo verb
A typical entry in whats-cooking.txt begins with the description of the topic, followed by "Will do what to this topic" declaration of the decision (i.e. $willdo verb) and supplemental text to explain the decision. When we read such an entry to add to a merge log message, we omit the line with "Will do what". Instead, stop reading there to exclude the supplemental text from the merge log.
This commit is contained in:
@@ -54,7 +54,7 @@ annotate_merge () {
|
||||
}
|
||||
next unless ($in_section && $in_desc);
|
||||
next if (/Originally merged to '\''next'\'' on ([-0-9]+)/);
|
||||
next if (wildo_match($_));
|
||||
last if (wildo_match($_));
|
||||
push @msg, "$_\n";
|
||||
}
|
||||
return ($in_section, @msg);
|
||||
|
||||
Reference in New Issue
Block a user