From: Junio C Hamano <junkio@cox.net>
Date: Thu, 3 Aug 2006 18:50:10 +0000 (-0700)
Subject: Fix "git diff blob1 blob2" showing the diff in reverse.
X-Git-Tag: v1.4.2-rc3~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f82cd3c6104733e2ff3305c325a440731aa1d17c;p=git.git

Fix "git diff blob1 blob2" showing the diff in reverse.

This was introduced by mistake when revision.c::add_pending_object()
was modified to use object-array instead of object-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-diff.c b/builtin-diff.c
index 48d2fd03b..ec27542d4 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -125,9 +125,6 @@ static int builtin_diff_blobs(struct rev_info *revs,
 			      int argc, const char **argv,
 			      struct blobinfo *blob)
 {
-	/* Blobs: the arguments are reversed when setup_revisions()
-	 * picked them up.
-	 */
 	unsigned mode = canon_mode(S_IFREG | 0644);
 
 	if (argc > 1)
@@ -135,7 +132,7 @@ static int builtin_diff_blobs(struct rev_info *revs,
 
 	stuff_change(&revs->diffopt,
 		     mode, mode,
-		     blob[1].sha1, blob[0].sha1,
+		     blob[0].sha1, blob[1].sha1,
 		     blob[0].name, blob[0].name);
 	diffcore_std(&revs->diffopt);
 	diff_flush(&revs->diffopt);