gitweb: Fix error in "rename to"/"copy to" git diff header output

Fix error in git_patchset_body subroutine, which caused "rename to"/"copy
to" line in extended diff header to be displayed incorrectly.

While at it, fix align.

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.perl b/gitweb.perl
index 7d54919c9d0a3c09fb22c9eaf0caef555311fa009c569e745810c0659e4ca0b7..9d135b77536bc6496c61909ad5143d2f888d7b6a27659caa6f4f70f2b798ab8e 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -2480,11 +2480,11 @@ sub git_patchset_body {
                        # match <path>
                        if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},
                        # match <path>
                        if ($patch_line =~ s!^((copy|rename) from ).*$!$1! && $from{'href'}) {
                                $patch_line .= $cgi->a({-href=>$from{'href'}, -class=>"path"},

-                                                       esc_path($from{'file'}));
+                                                      esc_path($from{'file'}));

                        }
                        if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {
                        }
                        if ($patch_line =~ s!^((copy|rename) to ).*$!$1! && $to{'href'}) {

-                               $patch_line = $cgi->a({-href=>$to{'href'}, -class=>"path"},
-                                                     esc_path($to{'file'}));
+                               $patch_line .= $cgi->a({-href=>$to{'href'}, -class=>"path"},
+                                                      esc_path($to{'file'}));

                        }
                        # match <mode>
                        if ($patch_line =~ m/\s(\d{6})$/) {
                        }
                        # match <mode>
                        if ($patch_line =~ m/\s(\d{6})$/) {