From: Junio C Hamano Date: Wed, 17 Jun 2026 21:47:18 +0000 (-0700) Subject: cook: 'Retracted' is a valid state X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=388856aaf17f8de384775a04fd23f2e394503a7f;p=thirdparty%2Fgit.git cook: 'Retracted' is a valid state --- diff --git a/Reintegrate b/Reintegrate index ca0a2410dc..da2f0ed5c8 100755 --- a/Reintegrate +++ b/Reintegrate @@ -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 604544ac15..188bf8988b 100755 --- 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; }