]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/cook: automate will merge to s/next/master/
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:27:30 +0000 (15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:27:30 +0000 (15:27 -0700)
cook

diff --git a/cook b/cook
index 65ba0455e4bf23475c2d816740a5e0fc5fa5505b..1bd34d9003fd8860949829921ba1fb9794de63a8 100755 (executable)
--- 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});
                }
        }