From 5d95246e8ab6088e26f3f2c6b1a3ab10abca78b8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 24 Oct 2014 15:27:30 -0700 Subject: [PATCH] Meta/cook: automate will merge to s/next/master/ --- cook | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cook b/cook index 65ba0455e4..1bd34d9003 100755 --- a/cook +++ b/cook @@ -536,6 +536,17 @@ sub topic_in_pu { return 0; } +sub tweak_willdo { + my ($td) = @_; + my $desc = $td->{'desc'}; + my $text = $td->{'text'}; + $desc =~ s/\n<<\n.*//s; + if ($desc =~ /^ \(merged to 'next'/m) { + $text =~ s/^ Will merge to 'next'\.$/ Will merge to 'master'./m; + } + $td->{'text'} = $text; +} + sub merge_cooking { my ($cooking, $current) = @_; my $td = $cooking->{'topic_description'}; @@ -569,6 +580,7 @@ sub merge_cooking { my $o = $td->{$topic}{'desc'}; if ($n ne $o) { $td->{$topic}{'desc'} = $n . "\n<<\n" . $o ."\n>>"; + tweak_willdo($td->{$topic}); } } -- 2.11.4.GIT