From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jan 2016 00:21:34 +0000 (-0800)
Subject: Meta/cook: 'Still doing something' is another keyphrase
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=783534b26f8357a565d7688a28918350142952f8;p=thirdparty%2Fgit.git

Meta/cook: 'Still doing something' is another keyphrase
---

diff --git a/Reintegrate b/Reintegrate
index 8dee292051..9761caff1a 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -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 5a703f6c08..6045c63c78 100755
--- 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 /) {