Meta/cook: automate will merge to s/next/master/
Junio C Hamano committed
Oct 24, 2014 at 15:27 UTC
5d95246e8ab6088e26f3f2c6b1a3ab10abca78b8
1 file changed
+12
cook
+12
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});
}
}