]> git.ipfire.org Git - thirdparty/git.git/commitdiff
cook: 'Retracted' is a valid state
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Jun 2026 21:47:18 +0000 (14:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Jun 2026 21:47:18 +0000 (14:47 -0700)
Reintegrate
cook

index ca0a2410dc42eda7663e33bb60daea12d6420a30..da2f0ed5c85d0d8ae0ba17b2d92697cef41b8d89 100755 (executable)
@@ -39,7 +39,7 @@ annotate_merge () {
                        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 / || /^Under discussion/ ||
                            /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ || /^Breaks / ||
-                           /^Inviting / || /^Comments\?/ ||
+                           /^Inviting / || /^Comments\?/ || /^Retracted/ ||
                            /^Needs? / || /^Expecting / || /^May want to / || /^Under review/) {
                                return 1;
                        }
diff --git a/cook b/cook
index 604544ac15c907ce317e66f27212fd476c1f92a4..188bf8988b3abfd54fcf55721af2c1ece0c53c66 100755 (executable)
--- a/cook
+++ b/cook
@@ -932,7 +932,7 @@ sub wildo_match {
        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 / || /^Under discussion/ ||
            /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ || /^Breaks / ||
-           /^Inviting / || /^Comments/ ||
+           /^Inviting / || /^Comments/ || /^Retracted/ ||
            /^Needs? / || /^Expecting / || /^May want to / || /^Under review/) {
                return 1;
        }