From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jun 2016 22:20:49 +0000 (-0700)
Subject: Meta/Reintegrate: omit everything after $willdo verb
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dc125e01b89e6cfb9f0b9215b41f6083d4dfded;p=thirdparty%2Fgit.git

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.
---

diff --git a/Reintegrate b/Reintegrate
index 9761caff1a..a15114a690 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -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);