[PATCH v2 1/3] gitweb: Cleanup git_print_log()
- From
Namhyung Kim <namhyung@kernel.org>
- Date
- Jul 4, 2012, 02:47 UTC
- Message-ID
- <1341370046-19913-1-git-send-email-namhyung@kernel.org>
If $signoff set to 1, the $line would be handled in the if statement for the both cases. So the outer of the conditional always sees the $signoff always set to 0 and no need to check it. Thus we can finally get rid of it.
Also rename $empty to more clear $skip_blank_line as suggested by Junio.
Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- gitweb/gitweb.perl | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 55e0e9e..82c5da7 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -4484,30 +4484,23 @@ sub git_print_log { } # print log - my $signoff = 0; - my $empty = 0; + my $skip_blank_line = 0; foreach my $line (@$log) { if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { - $signoff = 1; - $empty = 0; if (! $opts{'-remove_signoff'}) { print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n"; - next; - } else { - # remove signoff lines - next; + $skip_blank_line = 1; } - } else { - $signoff = 0; + next; } # print only one empty line # do not print empty line after signoff if ($line eq "") { - next if ($empty || $signoff); - $empty = 1; + next if ($skip_blank_line); + $skip_blank_line = 1; } else { - $empty = 0; + $skip_blank_line = 0; } print format_log_line_html($line) . "<br/>\n"; @@ -4515,7 +4508,7 @@ sub git_print_log { if ($opts{'-final_empty_line'}) { # end with single empty line - print "<br/>\n" unless $empty; + print "<br/>\n" unless $skip_blank_line; } }
-- 1.7.10.4