diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-04 00:45:15 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-10-04 00:45:15 -0400 |
| commit | 4736d74479745f0f5a0129fba4628a742034b90e (patch) | |
| tree | 02a824c36d1edebd58c10f1d75853a79be494394 /src | |
| parent | 11d8d72c27a64ea4e30adce11cf6c4f3dd3e60db (diff) | |
| download | postgresql-4736d74479745f0f5a0129fba4628a742034b90e.tar.gz postgresql-4736d74479745f0f5a0129fba4628a742034b90e.zip | |
Adjust git_changelog for new-style release tags.
It wasn't on board with REL_n_n format.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/tools/git_changelog | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/git_changelog b/src/tools/git_changelog index a66b64467f7..2fc1565a6c3 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -102,8 +102,9 @@ my %rel_tags; { my $commit = $1; my $tag = $2; - if ( $tag =~ /^REL\d+_\d+$/ - || $tag =~ /^REL\d+_\d+_\d+$/) + if ($tag =~ /^REL_\d+_\d+$/ + || $tag =~ /^REL\d+_\d+$/ + || $tag =~ /^REL\d+_\d+_\d+$/) { $rel_tags{$commit} = $tag; } @@ -198,6 +199,7 @@ for my $branch (@BRANCHES) $last_tag = $sprout_tags{$commit}; # normalize branch names for making sprout tags + $last_tag =~ s/^(REL_\d+).*/$1_BR/; $last_tag =~ s/^(REL\d+_\d+).*/$1_BR/; } $c->{'last_tag'} = $last_tag; |