]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Reintegrate: teach 'On hold' status
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Feb 2019 22:27:42 +0000 (07:27 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Feb 2019 22:27:42 +0000 (07:27 +0900)
Reintegrate

index 883ecd77e5708a3ea10c18a55923401274e7439b..aa12b7b9f422fa556fc40230bb97e3465ee40112 100755 (executable)
@@ -32,12 +32,13 @@ done
 annotate_merge () {
        test -f Meta/whats-cooking.txt || return 0
 
+       # NEEDSWORK: unify with cook::wildo_match
        perl -e '
                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 / ||
-                           /^Can wait in / || /^Still / || /^Stuck / ||
+                           /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ ||
                            /^Needs? / || /^Expecting / || /^May want to /) {
                                return 1;
                        }