threads / patch / 53316

patchgitweb: Recognize *-to and Closes/Fixes trailers

Subject: [PATCH] gitweb: Recognize *-to and Closes/Fixes trailers

## tl;dr

3 messages between Apr 25, 2020 and Apr 25, 2020. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Emma Brooks· Apr 25, 2020, 02:17 UTC · lore

Commit trailers like "Thanks-to:", "Fixes:", and "Closes:" are fairly common, but gitweb didn't highlight them like other trailers.

Signed-off-by: Emma Brooks <me@pluvano.com>
---
 gitweb/gitweb.perl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to gitweb/gitweb.perl +1 −1

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1a02a1242d..0959a782ec 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4641,7 +4641,7 @@ sub git_print_log {
 	# print log
 	my $skip_blank_line = 0;
 	foreach my $line (@$log) {
-		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) {
+		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o)|C[Cc]|(Clos|Fix)es): /) {
 			if (! $opts{'-remove_signoff'}) {
 				print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
 				$skip_blank_line = 1;

Junio C Hamano· Apr 25, 2020, 05:17 UTC · re: Emma Brooks · lore

Re: [PATCH] gitweb: Recognize *-to and Closes/Fixes trailers

Emma Brooks <me@pluvano.com> writes:

> Commit trailers like "Thanks-to:", "Fixes:", and "Closes:" are fairly
> common, but gitweb didn't highlight them like other trailers.

Did you also sneak "cc" in without documenting/justifying?

When the re becomes this complex, it may not be a bad idea to switch to "/ ignore most whitespaces /x" style for readability.

> -		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) {
> +		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o)|C[Cc]|(Clos|Fix)es): /) {

		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o) |
				    C[Cc] | Closes | Fixes ):\s /x) {

Well, I am sloppy and did not make it all that easier to read.

More experienced Perl folks certainly would be able to teach us a much better convention to format things like this more readble.

Emma Brooks· Apr 25, 2020, 06:29 UTC · re: Junio C Hamano · lore

Re: [PATCH] gitweb: Recognize *-to and Closes/Fixes trailers

On 2020-04-24 22:17:58-0700, Junio C Hamano wrote:

> Did you also sneak "cc" in without documenting/justifying?

No, that was already there in the original, before the colon:

> > -		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) {
> > +		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o)|C[Cc]|(Clos|Fix)es): /) {