From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2024 22:47:25 +0000 (-0700)
Subject: Meta/cook: Sync What's cooking keywords between cook and Reintegrate scripts
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a46c71d747834c6bf035d2d404b07f624d7e1169;p=thirdparty%2Fgit.git

Meta/cook: Sync What's cooking keywords between cook and Reintegrate scripts
---

diff --git a/Reintegrate b/Reintegrate
index cf74e4394f..f15efb6679 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -37,7 +37,7 @@ annotate_merge () {
 		sub wildo_match {
 			s/^\s*//;
 			if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled|wait)[,. ]/ ||
-			    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
+			    /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Under discussion/ ||
 			    /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ || /^Breaks / ||
 			    /^Needs? / || /^Expecting / || /^May want to / || /^Under review/) {
 				return 1;
diff --git a/cook b/cook
index 1dd676463b..597f99645b 100755
--- a/cook
+++ b/cook
@@ -870,9 +870,6 @@ sub wildo_match {
 	    /^Needs? / || /^Expecting / || /^May want to / || /^Under review/) {
 		return 1;
 	}
-	if (/^I think this is ready for /) {
-		return 1;
-	}
 	return 0;
 }