From: Jakub Narebski <jnareb@gmail.com>
Date: Sat, 26 Aug 2006 10:33:17 +0000 (+0200)
Subject: gitweb: Remove workaround for git-diff bug fixed in f82cd3c
X-Git-Tag: v1.4.3-rc1~168^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=73c9083f52ac918b530c51887bbf5fd0a1119b4c;p=git.git

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>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index e00a6ed6e..5d321e9b3 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")