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

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>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 25e5079a89dd22e7c8eb2b7e3ac276681eae83b4..88af2e638061f54cfd7f6ffc6ae777ef2756c603 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -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;
 
                # check if current patch belong to current raw line
                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line


@@ -2522,7 +2521,10 @@ sub git_patchset_body {
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;
 
                # from-file/to-file diff header
                $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 /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
                next PATCH if ($patch_line =~ m/^diff /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                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";
 
                $patch_line = <$fd>;
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;

-               #last PATCH unless $patch_line;

                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;
                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;