summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2012-07-04 02:47:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-05 22:23:35 (GMT)
commit3d1110aa72e4427e82e70563f734c74cd08fe98e (patch)
tree8e6f14f4f3cdbaa668d9b9613c8f60fb3f9626fb /gitweb
parent5a45c0cafe6d73f6026bd0ea525da2f9765b112d (diff)
downloadgit-3d1110aa72e4427e82e70563f734c74cd08fe98e.zip
git-3d1110aa72e4427e82e70563f734c74cd08fe98e.tar.gz
git-3d1110aa72e4427e82e70563f734c74cd08fe98e.tar.bz2
gitweb: Handle other types of tag in git_print_log
There are many types of tags used in S-o-b area [1]. Update the regex to handle them properly. It requires the tag should be started by a capital letter and ended by '-by: ' or '-By: '. The only exception is 'Cc: '. [1] http://lwn.net/Articles/503829/ Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e4a26cb..0f8b6e2 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -4462,7 +4462,7 @@ sub git_print_log {
# print log
my $skip_blank_line = 0;
foreach my $line (@$log) {
- if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
+ if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) {
if (! $opts{'-remove_signoff'}) {
print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
$skip_blank_line = 1;