diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-05 16:34:51 -0700 |
| commit | 77e6f5bc1009aa588a3b2235758bf5be13b23d85 (patch) | |
| tree | cb040ac72459291eda6adf1aa9f10778bc54cdbf /gitweb | |
| parent | Fix passing of TCLTK_PATH to git-gui (diff) | |
| parent | Fix lseek(2) calls with args 2 and 3 swapped (diff) | |
| download | tgif-77e6f5bc1009aa588a3b2235758bf5be13b23d85.tar.xz | |
Merge branch 'maint'
* maint:
Fix lseek(2) calls with args 2 and 3 swapped
Honor -p<n> when applying git diffs
Fix dependency of common-cmds.h
Fix renaming branch without config file
DESTDIR support for git/contrib/emacs
gitweb: Fix bug in "blobdiff" view for split (e.g. file to symlink) patches
Document --left-right option to rev-list.
Revert "builtin-archive: use RUN_SETUP"
rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email.
rerere: make sorting really stable.
Fix t4200-rerere for white-space from "wc -l"
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index ea491562c8..e49eb91d69 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -3934,7 +3934,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"); } @@ -3969,7 +3970,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 { |