undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Cleanup git_print_log()

Browse Source 
When we see a signed-off-by line (and its friends), we set $signoff
to true, but then we process the next line after we are done without
giving control to the rest of the loop.  And when the line we saw is
not a signed-off-by line, we reset $signoff to false before running
the remainder of the loop.

Hence, the check for $signoff that attempts to remove an extra empty
line between two signed-off-by line was not doing anything useful.

Rename $empty to a more explicit name $skip_blank_line to tell us to
skip a blank line when we see one, set it after we see and emit a
blank line (to avoid showing more than one empty lines in a raw) or
after we handle a signed-off-by line (to avoid empty lines after
such a line), to fix this bug, and get rid of the $signoff variable
that is not useful.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Namhyung Kim 2012-07-04 11:47:24 +09:00 committed by Junio C Hamano
parent 785ee4960c
commit 5a45c0cafe
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gitweb/gitweb.perl
View File

@ -4460,30 +4460,23 @@ sub git_print_log {
} }
# print log # print log
my $signoff = 0; my $skip_blank_line = 0;
my $empty = 0;
foreach my $line (@$log) { foreach my $line (@$log) {
if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) {
$signoff = 1;
$empty = 0;
if (! $opts{'-remove_signoff'}) { if (! $opts{'-remove_signoff'}) {
print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n"; print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
next; $skip_blank_line = 1;
} else {
# remove signoff lines
next;
} }
} else { next;
$signoff = 0;
} }
# print only one empty line # print only one empty line
# do not print empty line after signoff # do not print empty line after signoff
if ($line eq "") { if ($line eq "") {
next if ($empty || $signoff); next if ($skip_blank_line);
$empty = 1; $skip_blank_line = 1;
} else { } else {
$empty = 0; $skip_blank_line = 0;
} }
print format_log_line_html($line) . "<br/>\n"; print format_log_line_html($line) . "<br/>\n";
@ -4491,7 +4484,7 @@ sub git_print_log {
if ($opts{'-final_empty_line'}) { if ($opts{'-final_empty_line'}) {
# end with single empty line # end with single empty line
print "<br/>\n" unless $empty; print "<br/>\n" unless $skip_blank_line;
} }
} }