[PATCH (resend)] gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 5, 2007, 11:45 UTC
- Message-ID
- <1175773541251-git-send-email-jnareb@gmail.com>
git_patchset_body needs patch generated with --full-index option to detect split patches, meaning two patches which corresponds to single difftree (raw diff) entry. An example of such situation is changing type (mode) of a file, e.g. from plain file to symbolic link.
Add, in git_blobdiff, --full-index option to patch generating git diff invocation, for the 'html' format output ("blobdiff" view).
"blobdiff_plain" still uses shortened sha1 in the extended git diff header "index <hash>..<hash>[ <mode>]" line.
Noticed-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- On Wed, Mar 28, 2007 at 23:03 +0200, Martin Koegler wrote:
Show 20 quoted lines
> Blobdiff (html output) in its current version can not handle symlinks: > > diff --git a/x b/x > deleted file mode 100644 (file) > index 190a180..873fb8d > --- a/x > +++ /dev/null > @@ -1 +0,0 @@ > -123 > diff --git a/ b/ > new file mode 120000 (symlink) > index 190a180..873fb8d > --- /dev/null > +++ b/ > @@ -0,0 +1 @@ > +file3 > \ No newline at end of file > > This was generated by "diff to current" in the history view of a file, > which was changed between symlink and normal file.
This patch fixes this bug in git_blobdiff (in "blobdiff" view).
Junio, you probably have missed this patch in the noise...
gitweb/gitweb.perl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 4f34c29..d1f4aeb 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3936,7 +3936,8 @@ sub git_blobdiff { # open patch output open $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, - '-p', $hash_parent_base, $hash_base, + '-p', ($format eq 'html' ? "--full-index" : ()), + $hash_parent_base, $hash_base, "--", (defined $file_parent ? $file_parent : ()), $file_name or die_error(undef, "Open git-diff-tree failed"); } @@ -3971,7 +3972,8 @@ sub git_blobdiff { } # open patch output - open $fd, "-|", git_cmd(), "diff", '-p', @diff_opts, + open $fd, "-|", git_cmd(), "diff", @diff_opts, + '-p', ($format eq 'html' ? "--full-index" : ()), $hash_parent, $hash, "--" or die_error(undef, "Open git-diff failed"); } else {
-- 1.5.0.5