Adjust git_changelog for new-style release tags.

tglsfdc · tglsfdc · commit 4736d7447974 · 2017-10-04T00:45:15.000-04:00
It wasn't on board with REL_n_n format.
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,9 @@ my %rel_tags;`
`102`	`102`	`{`
`103`	`103`	`my $commit = $1;`
`104`	`104`	`my $tag = $2;`
`105`		`- if ( $tag =~ /^REL\d+_\d+$/`
`106`		`- \|\| $tag =~ /^REL\d+_\d+_\d+$/)`
	`105`	`+ if ($tag =~ /^REL_\d+_\d+$/`
	`106`	`+ \|\| $tag =~ /^REL\d+_\d+$/`
	`107`	`+ \|\| $tag =~ /^REL\d+_\d+_\d+$/)`
`107`	`108`	`{`
`108`	`109`	`$rel_tags{$commit} = $tag;`
`109`	`110`	`}`
`@@ -198,6 +199,7 @@ for my $branch (@BRANCHES)`
`198`	`199`	`$last_tag = $sprout_tags{$commit};`
`199`	`200`
`200`	`201`	`# normalize branch names for making sprout tags`
	`202`	`+ $last_tag =~ s/^(REL_\d+).*/$1_BR/;`
`201`	`203`	`$last_tag =~ s/^(REL\d+_\d+).*/$1_BR/;`
`202`	`204`	`}`
`203`	`205`	`$c->{'last_tag'} = $last_tag;`