]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: Breaks is a significant word
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2022 18:35:28 +0000 (10:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2022 18:35:28 +0000 (10:35 -0800)
Reintegrate

index 2c59e4d1296fd6c24475b997f2903e207fc973ed..85d95bcecbb6ec0e46c3e09b82f39cec6866f509 100755 (executable)
@@ -38,8 +38,8 @@ annotate_merge () {
                        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 / || /^On hold/ ||
-                           /^Needs? / || /^Expecting / || /^May want to /) {
+                           /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ || /^Breaks / ||
+                           /^Needs? / || /^Expecting / || /^May want to / || /^Under review/) {
                                return 1;
                        }
                        return 0;