]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook: pick up more key phrases
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 21:44:37 +0000 (14:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 21:44:37 +0000 (14:44 -0700)
cook

diff --git a/cook b/cook
index f3afbd39b461da29a93b49d6334c233c648120e7..9eca27f1e3aa2add91f033045d6a814b43c13a93 100755 (executable)
--- a/cook
+++ b/cook
@@ -630,18 +630,18 @@ sub wildo {
                        $topic->[4]++;
                }
                next if (/^ /);
-               if (defined $topic &&
-                   /Will (?:\S+ ){0,2}(merge|drop|discard|cook)[. ]/i) {
+               next unless defined $topic;
+               if (/^Will (?:\S+ ){0,2}(merge|drop|discard|cook|kick)[,. ]/ ||
+                   /^Not urgent/ ||
+                   /^Needs? /) {
                        wildo_queue(\%what, $_, $topic);
                        $topic = undef;
                }
-               if (defined $topic &&
-                   /^Not urgent;/) {
+               if (/^Not urgent;/) {
                        wildo_queue(\%what, $_, $topic);
                        $topic = undef;
                }
-               if (defined $topic &&
-                   /Originally merged to 'next' on ([-0-9]+)/) {
+               if (/Originally merged to 'next' on ([-0-9]+)/) {
                        $topic->[1] = $1;
                }
        }