]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook: Sync What's cooking keywords between cook and Reintegrate scripts
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2024 22:47:25 +0000 (15:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2024 22:47:25 +0000 (15:47 -0700)
Reintegrate
cook

index cf74e4394f10c5db294fac43337d6ecc65bb9599..f15efb6679c9cdc7aa620301e5f6336394e12274 100755 (executable)
@@ -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 1dd676463bccabb07a03f98f3786a7f788ea8349..597f99645b16c297127217eeb159f65e5fe79c3c 100755 (executable)
--- 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;
 }