]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook: 'Still doing something' is another keyphrase
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2016 00:21:34 +0000 (16:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2016 00:21:34 +0000 (16:21 -0800)
Reintegrate
cook

index 8dee292051eb08bb01059b3913995d5aa3d25aaf..9761caff1ae50e98c5fadc275e28d202f58ad4ba 100755 (executable)
@@ -29,7 +29,7 @@ annotate_merge () {
                        s/^\s*//;
                        if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
                            /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
-                           /^Can wait in / ||
+                           /^Can wait in / || /^Still / ||
                            /^Needs? / || /^Expecting / || /^May want to /) {
                                return 1;
                        }
diff --git a/cook b/cook
index 5a703f6c08f2ee3aebc5e14643b2e98c606bab97..6045c63c783db3ffbf6a115d11e79d9a1392b22c 100755 (executable)
--- a/cook
+++ b/cook
@@ -242,8 +242,8 @@ sub get_commit {
                        push @desc, $commit{$_}->{'log'};
                }
 
-               if (80 < @desc) {
-                       @desc = @desc[0..4];
+               if (100 < @desc) {
+                       @desc = @desc[0..99];
                        push @desc, "- ...";
                }
 
@@ -653,7 +653,7 @@ 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 /) {
+           /^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
                return 1;
        }
        if (/^I think this is ready for /) {