From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Oct 2011 21:44:37 +0000 (-0700)
Subject: Meta/cook: pick up more key phrases
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5971de8248397e2230641d0e05519dc06b66cb1;p=thirdparty%2Fgit.git

Meta/cook: pick up more key phrases
---

diff --git a/cook b/cook
index f3afbd39b4..9eca27f1e3 100755
--- 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;
 		}
 	}