Meta/cook: Sync What's cooking keywords between cook and Reintegrate scripts
Junio C Hamano committed
Jul 12, 2024 at 15:47 UTC
a46c71d747834c6bf035d2d404b07f624d7e1169
2 files changed
+1
-4
Reintegrate
+1
-1
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;
cook
-3
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;
}