dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-07 00:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta/cook, Meta/Reintegrate: add a few more $willdo verbs

Browse Source 
"Will hold" and "Will eject (from ...)" are common things to say.
This commit is contained in:
Junio C Hamano
2016-06-23 15:26:09 -07:00
parent 083f201b04
commit 17abc906c5
2 changed files with 5 additions and 4 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|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
/^Not urgent/ || /^Not ready/ || /^Waiting for / ||
/^Can wait in / || /^Still / ||
/^Needs? / || /^Expecting / || /^May want to /) {

7
cook
View File

@@ -682,9 +682,10 @@ 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 / || /^Still /) {
if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled)[,. ]/ ||
/^Not urgent/ || /^Not ready/ || /^Waiting for / ||
/^Can wait in / || /^Still / ||
/^Needs? / || /^Expecting / || /^May want to /) {
return 1;
}
if (/^I think this is ready for /) {