]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook, Meta/Reintegrate: add a few more $willdo verbs
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Jun 2016 22:26:09 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Jun 2016 22:30:20 +0000 (15:30 -0700)
"Will hold" and "Will eject (from ...)" are common things to say.

Reintegrate
cook

index 5dbf853a024365c36b4f7af9396a1d5744d3bb15..b4a64fb2753db7ec33a2542fd44ac25cc3125848 100755 (executable)
@@ -27,7 +27,7 @@ annotate_merge () {
        perl -e '
                sub wildo_match {
                        s/^\s*//;
-                       if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
+                       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
                            /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
                            /^Can wait in / || /^Still / ||
                            /^Needs? / || /^Expecting / || /^May want to /) {
diff --git a/cook b/cook
index e357f90ab941d065fdaf29ca6f051b593db24d65..3815aee776ac93c540a64d2608b34c42bfb34d76 100755 (executable)
--- a/cook
+++ b/cook
@@ -682,9 +682,10 @@ sub wildo_flush_topic {
 }
 
 sub wildo_match {
-       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
-           /^Not urgent/ || /^Not ready/ || /^Waiting for / || /^Can wait in / ||
-           /^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
+       if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+           /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
+           /^Can wait in / || /^Still / ||
+           /^Needs? / || /^Expecting / || /^May want to /) {
                return 1;
        }
        if (/^I think this is ready for /) {