rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust git_changelog for new-style release tags. 

It wasn't on board with REL_n_n format.
This commit is contained in:
Tom Lane 2017-10-04 00:45:15 -04:00
parent 11d8d72c27
commit 4736d74479
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/git_changelog
View File

@ -102,8 +102,9 @@ my %rel_tags;
{ {
my $commit = $1; my $commit = $1;
my $tag = $2; my $tag = $2;
if ( $tag =~ /^REL\d+_\d+$/ if ($tag =~ /^REL_\d+_\d+$/
|| $tag =~ /^REL\d+_\d+_\d+$/) || $tag =~ /^REL\d+_\d+$/
|| $tag =~ /^REL\d+_\d+_\d+$/)
{ {
$rel_tags{$commit} = $tag; $rel_tags{$commit} = $tag;
} }
@ -198,6 +199,7 @@ for my $branch (@BRANCHES)
$last_tag = $sprout_tags{$commit}; $last_tag = $sprout_tags{$commit};
# normalize branch names for making sprout tags # normalize branch names for making sprout tags
$last_tag =~ s/^(REL_\d+).*/$1_BR/;
$last_tag =~ s/^(REL\d+_\d+).*/$1_BR/; $last_tag =~ s/^(REL\d+_\d+).*/$1_BR/;
} }
$c->{'last_tag'} = $last_tag; $c->{'last_tag'} = $last_tag;