Meta/cook: catch 'will wait...', too
... and ignore ??/wip-* while at it.
Junio C Hamano committed
Jul 7, 2017 at 12:24 UTC
0862e13a57d208d04d8d5cbbb99404c2aab8bbf3
2 files changed
+4
-2
Reintegrate
+1
-1
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 /) {
cook
+3
-1
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 /) {