From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Cc: Luben Tuikov <ltuikov@yahoo•com>, Jakub Narebski <jnareb@gmail•com>
Subject: [PATCH 5/5] gitweb: Fix split patches output (e.g. file to symlink)
Date: Sun, 7 Jan 2007 02:52:27 +0100 [thread overview]
Message-ID: <11681347551377-git-send-email-jnareb@gmail.com> (raw)
In-Reply-To: <100171.86639.qm@web31814.mail.mud.yahoo.com>
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>
---
gitweb/gitweb.perl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d60d7c6..f46a422 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'}));
--
1.4.4.3
prev parent reply other threads:[~2007-01-07 1:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-05 1:29 Bugs in gitweb Luben Tuikov
2007-01-07 1:52 ` [PATCH 0/5] gitweb: git_patchset_body fixes Jakub Narebski
2007-01-08 3:50 ` Luben Tuikov
2007-01-08 9:03 ` Jakub Narebski
2007-01-09 4:25 ` Luben Tuikov
2007-01-09 10:27 ` Jakub Narebski
2007-01-09 16:44 ` Jakub Narebski
2007-01-09 21:38 ` Luben Tuikov
2007-01-09 23:07 ` [PATCH] gitweb: Fix git_patchset_body not closing <div class="patch"> Jakub Narebski
2007-01-09 23:35 ` Luben Tuikov
2007-01-09 20:54 ` [PATCH 0/5] gitweb: git_patchset_body fixes Luben Tuikov
2007-01-07 1:52 ` [PATCH 1/5] gitweb: Fix error in git_patchest_body for file creation/deletion patch Jakub Narebski
2007-01-08 3:53 ` Luben Tuikov
2007-01-07 1:52 ` [PATCH 2/5] gitweb: Fix error in "rename to"/"copy to" git diff header output Jakub Narebski
2007-01-07 1:52 ` [PATCH 3/5] gitweb: Fix errors in git_patchset_body for empty patches Jakub Narebski
2007-01-07 1:52 ` [PATCH 4/5] Revert "gitweb: There can be empty patches (in git_patchset_body)" Jakub Narebski
2007-01-07 1:52 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11681347551377-git-send-email-jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ltuikov@yahoo$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox