dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-07 08:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta/cook: automate will merge to s/next/master/

Browse Source
This commit is contained in:
Junio C Hamano
2014-10-24 15:27:30 -07:00
parent 0a61ccedfc
commit 5d95246e8a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cook
View File

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