diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-01-07 02:52:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-06 22:53:08 -0800 |
| commit | 13e86efbeae5994a85cc482b3964db7298c5c6ea (patch) | |
| tree | 6080d4a1bd568018b27d85fc533677fb139eaf4c /gitweb | |
| parent | ac8b0cd1cd61f74b76261df17a15ada87f437269 (diff) | |
| download | git-13e86efbeae5994a85cc482b3964db7298c5c6ea.tar.gz git-13e86efbeae5994a85cc482b3964db7298c5c6ea.tar.xz | |
gitweb: Fix split patches output (e.g. file to symlink)
Do not replace /dev/null in two-line from-file/to-file diff header for
split patches ("split" patch mean more than one patch per one
diff-tree raw line) by a/file or b/file link.
Split patches differ from pair of deletion/creation patch in git diff
header: both a/file and b/file are hyperlinks, in all patches in a
split.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index d60d7c665..f46a42296 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2525,7 +2525,7 @@ sub git_patchset_body { last PATCH unless $patch_line; next PATCH if ($patch_line =~ m/^diff /); #assert($patch_line =~ m/^---/) if DEBUG; - if ($from{'href'}) { + if ($from{'href'} && $patch_line =~ m!^--- "?a/!) { $patch_line = '--- a/' . $cgi->a({-href=>$from{'href'}, -class=>"path"}, esc_path($from{'file'})); @@ -2537,7 +2537,7 @@ sub git_patchset_body { chomp $patch_line; #assert($patch_line =~ m/^+++/) if DEBUG; - if ($to{'href'}) { + if ($to{'href'} && $patch_line =~ m!^\+\+\+ "?b/!) { $patch_line = '+++ b/' . $cgi->a({-href=>$to{'href'}, -class=>"path"}, esc_path($to{'file'})); |