Meta/cook: support 'will merge back to next'
Junio C Hamano committed
Dec 18, 2022 at 13:32 UTC
aab563340cfe587c07240d6d47a0e84640fefcc4
1 file changed
+1
-1
cook
+1
-1
index da832a306f..e3e37aacd2 100755
--- a/cook
+++ b/cook
@@ -709,7 +709,7 @@ sub tweak_willdo {
# NEEDSWORK: does this work correctly for a half-merged topic?
$desc =~ s/\n<<\n.*//s;
if ($desc =~ /^ \(merged to 'next'/m) {
- $text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
+ $text =~ s/^ Will merge (back )?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'\.$/ Will merge to '$MASTER'./m;
}