From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 19:24:37 +0000 (-0700)
Subject: Meta/cook: catch 'will wait...', too
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0862e13a57d208d04d8d5cbbb99404c2aab8bbf3;p=thirdparty%2Fgit.git

Meta/cook: catch 'will wait...', too

... and ignore ??/wip-* while at it.
---

diff --git a/Reintegrate b/Reintegrate
index 34ba795c82..7767a079b5 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -27,7 +27,7 @@ annotate_merge () {
 	perl -e '
 		sub wildo_match {
 			s/^\s*//;
-			if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+			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 / ||
 			    /^Needs? / || /^Expecting / || /^May want to /) {
diff --git a/cook b/cook
index 7afa1e21e9..7370f95bb3 100755
--- a/cook
+++ b/cook
@@ -120,6 +120,8 @@ sub get_commit {
 	while (<$fh>) {
 		chomp;
 		my ($branch, $date) = /^(\S+) (.*)$/;
+
+		next if ($branch =~ m|^../wip-|);
 		push @topic, $branch;
 		$date =~ s/ .*//;
 		$topic{$branch} = +{
@@ -684,7 +686,7 @@ sub wildo_flush_topic {
 }
 
 sub wildo_match {
-	if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
+	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 / ||
 	    /^Needs? / || /^Expecting / || /^May want to /) {