From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jun 2016 22:26:09 +0000 (-0700)
Subject: Meta/cook, Meta/Reintegrate: add a few more $willdo verbs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17abc906c52dc431aed5153ebf00c7dd24371b75;p=thirdparty%2Fgit.git

Meta/cook, Meta/Reintegrate: add a few more $willdo verbs

"Will hold" and "Will eject (from ...)" are common things to say.
---

diff --git a/Reintegrate b/Reintegrate
index 5dbf853a02..b4a64fb275 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -27,7 +27,7 @@ annotate_merge () {
 	perl -e '
 		sub wildo_match {
 			s/^\s*//;
-			if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
+			if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
 			    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
 			    /^Can wait in / || /^Still / ||
 			    /^Needs? / || /^Expecting / || /^May want to /) {
diff --git a/cook b/cook
index e357f90ab9..3815aee776 100755
--- a/cook
+++ b/cook
@@ -682,9 +682,10 @@ sub wildo_flush_topic {
 }
 
 sub wildo_match {
-	if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
-	    /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Can wait in / ||
-	    /^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
+	if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+	    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
+	    /^Can wait in / || /^Still / ||
+	    /^Needs? / || /^Expecting / || /^May want to /) {
 		return 1;
 	}
 	if (/^I think this is ready for /) {