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:
Junio C Hamano
2016-06-23 15:20:49 -07:00
parent 09537cff1a
commit 2dc125e01b

View File

@@ -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);