mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Fix git_patchset_body not closing <div class="patch">

Browse Source 
Fix case when git_patchset_body didn't close <div class="patch">,
for patchsets with last patch empty.

This patch also removes some commented out code in git_patchset_body.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski
2007-01-10 00:07:43 +01:00
committed by Junio C Hamano
parent 03d311eda2
commit 0bdb28c9cc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gitweb/gitweb.perl
View File

@ -2412,7 +2412,6 @@ sub git_patchset_body {
push @diff_header, $patch_line; push @diff_header, $patch_line;
} }
#last PATCH unless $patch_line;
my $last_patch_line = $patch_line; my $last_patch_line = $patch_line;
# check if current patch belong to current raw line # check if current patch belong to current raw line
@ -2522,7 +2521,10 @@ sub git_patchset_body {
# from-file/to-file diff header # from-file/to-file diff header
$patch_line = $last_patch_line; $patch_line = $last_patch_line;
last PATCH unless $patch_line; if (! $patch_line) {
print "</div>\n"; # class="patch"
last PATCH;
}
next PATCH if ($patch_line =~ m/^diff /); next PATCH if ($patch_line =~ m/^diff /);
#assert($patch_line =~ m/^---/) if DEBUG; #assert($patch_line =~ m/^---/) if DEBUG;
if ($from{'href'} && $patch_line =~ m!^--- "?a/!) { if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
@ -2533,7 +2535,6 @@ sub git_patchset_body {
print "<div class=\"diff from_file\">$patch_line</div>\n"; print "<div class=\"diff from_file\">$patch_line</div>\n";
$patch_line = <$fd>; $patch_line = <$fd>;
#last PATCH unless $patch_line;
chomp $patch_line; chomp $patch_line;
#assert($patch_line =~ m/^+++/) if DEBUG; #assert($patch_line =~ m/^+++/) if DEBUG;