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

Meta/cook: 'Still doing something' is another keyphrase

Browse Source
This commit is contained in:
Junio C Hamano
2016-01-26 16:21:34 -08:00
parent 1ed08b0caa
commit 783534b26f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reintegrate
View File

@@ -29,7 +29,7 @@ annotate_merge () {
s/^\s*//;
if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
/^Not urgent/ || /^Not ready/ || /^Waiting for / ||
/^Can wait in / ||
/^Can wait in / || /^Still / ||
/^Needs? / || /^Expecting / || /^May want to /) {
return 1;
}

6
cook
View File

@@ -242,8 +242,8 @@ sub get_commit {
push @desc, $commit{$_}->{'log'};
}
if (80 < @desc) {
@desc = @desc[0..4];
if (100 < @desc) {
@desc = @desc[0..99];
push @desc, "- ...";
}
@@ -653,7 +653,7 @@ 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 /) {
/^Needs? / || /^Expecting / || /^May want to / || /^Still /) {
return 1;
}
if (/^I think this is ready for /) {