diff options
author | Jakub Narebski <jnareb@gmail.com> | 2006-08-26 12:33:17 +0200 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-08-26 12:26:42 -0700 |
commit | 73c9083f52ac918b530c51887bbf5fd0a1119b4c (patch) | |
tree | c299d15c9cc9cec25ac4c0dfa330aa054136753c /gitweb/gitweb.perl | |
parent | Merge branch 'master' into gl/web (diff) | |
download | tgif-73c9083f52ac918b530c51887bbf5fd0a1119b4c.tar.xz |
gitweb: Remove workaround for git-diff bug fixed in f82cd3c
Remove workaround in git_blobdiff for error in git-diff (showing
reversed diff for diff of blobs), corrected in commit f82cd3c
Fix "git diff blob1 blob2" showing the diff in reverse. which
is post 1.4.2-rc2 commit.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index e00a6ed6e0..5d321e9b3b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2834,8 +2834,7 @@ sub git_blobdiff { } # open patch output - #open $fd, "-|", $GIT, "diff", '-p', $hash_parent, $hash - open $fd, "-|", $GIT, "diff", '-p', $hash, $hash_parent + open $fd, "-|", $GIT, "diff", '-p', $hash_parent, $hash or die_error(undef, "Open git-diff failed"); } else { die_error('404 Not Found', "Missing one of the blob diff parameters") |