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
@@ -709,7 +709,7 @@ sub tweak_willdo {
709
# NEEDSWORK: does this work correctly for a half-merged topic?
710
$desc =~ s/\n<<\n.*//s;
711
if ($desc =~ /^ \(merged to 'next'/m) {
712
- $text =~ s/^ Will merge to 'next'\.$/ $mergetomaster/m;
712
+ $text =~ s/^ Will merge (back )?to 'next'\.$/ $mergetomaster/m;
713
$text =~ s/^ Will merge to and (then )?cook in 'next'\.$/ Will cook in 'next'./m;
714
$text =~ s/^ Will merge to 'next' and (then )?to '$MASTER'\.$/ Will merge to '$MASTER'./m;
715
}