eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-25 08:17:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Junio C Hamano 2022-12-18 13:32:08 +09:00
parent 5e32df48a5
commit aab563340c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cook
View File

@ -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;
}