global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-16 13:49:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
... and ignore ??/wip-* while at it.
This commit is contained in:
Junio C Hamano
2017-07-07 12:24:37 -07:00
parent 118c25dd58
commit 0862e13a57
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reintegrate
View File

@@ -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 /) {

4
cook
View File

@@ -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 /) {