Meta/cook: 'Still doing something' is another keyphrase
Junio C Hamano committed
Jan 26, 2016 at 16:21 UTC
783534b26f8357a565d7688a28918350142952f8
2 files changed
+4
-4
Reintegrate
+1
-1
index 8dee292051..9761caff1a 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -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;
}
cook
+3
-3
index 5a703f6c08..6045c63c78 100755
--- a/cook
+++ b/cook
@@ -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 /) {