From 4736d74479745f0f5a0129fba4628a742034b90e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 4 Oct 2017 00:45:15 -0400
Subject: [PATCH] Adjust git_changelog for new-style release tags.

It wasn't on board with REL_n_n format.
---
 src/tools/git_changelog | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index a66b64467f..2fc1565a6c 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;