global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 06:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cook: teach 'on hold' and other status

Browse Source
This commit is contained in:
Junio C Hamano
2019-03-01 07:30:47 +09:00
parent 49e49d6823
commit 5410cdfd20
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cook
View File

@@ -579,8 +579,8 @@ sub tweak_willdo {
$desc =~ s/\n<<\n.*//s;
if ($desc =~ /^ \(merged to 'next'/m) {
$text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
$text =~ s/^ Will merge to and then cook in 'next'\.$/ Will cook in 'next'./m;
$text =~ s/^ Will merge to 'next' and then to 'master'\.$/ $mergetomaster/m;
$text =~ s/^ Will merge to and (then )?cook in 'next'\.$/ Will cook in 'next'./m;
$text =~ s/^ Will merge to 'next' and (then )?to 'master'\.$/ Will merge to 'master'./m;
}
$td->{'text'} = $text;
}
@@ -706,9 +706,10 @@ sub wildo_flush_topic {
}
sub wildo_match {
# NEEDSWORK: unify with Reintegrate::annotate_merge
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 / ||
/^Can wait in / || /^Still / || /^Stuck / || /^On hold/ ||
/^Needs? / || /^Expecting / || /^May want to /) {
return 1;
}