From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Dec 2022 04:32:08 +0000 (+0900)
Subject: Meta/cook: support 'will merge back to next'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab563340cfe587c07240d6d47a0e84640fefcc4;p=thirdparty%2Fgit.git

Meta/cook: support 'will merge back to next'
---

diff --git a/cook b/cook
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;
 	}