зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
ac8b0cd1cd
Коммит
13e86efbea
|
@ -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'}));
|
||||
|
|
Загрузка…
Ссылка в новой задаче