From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2017 22:18:20 +0000 (-0800)
Subject: Meta/cook: more auto-transition of states
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f71885f300637ea2bad62e268170d52d5eb8d1d;p=thirdparty%2Fgit.git

Meta/cook: more auto-transition of states

Just like "Will merge to 'next'" is automatically promoted to "Will
merge to 'master'" once the topic is merged to 'next', transition
two more states automatically when a topic is merged to 'next'.
"Will merge to and cook in 'next'" will become "Will cook in 'next'"
"Will merge to 'next' and then to 'master'" will become "Will merge
to 'master'".
---

diff --git a/cook b/cook
index 0035d65658..7afa1e21e9 100755
--- a/cook
+++ b/cook
@@ -557,6 +557,8 @@ sub tweak_willdo {
 	$desc =~ s/\n<<\n.*//s;
 	if ($desc =~ /^  \(merged to 'next'/m) {
 		$text =~ s/^ Will merge to 'next'\.$/ Will merge to 'master'./m;
+		$text =~ s/^ Will merge to and then cook in 'next'\.$/ Will cook in 'next'./m;
+		$text =~ s/^ Will merge to 'next' and then to 'master'\.$/ Will merge to 'master'./m;
 	}
 	$td->{'text'} = $text;
 }