From: Junio C Hamano <junkio@cox.net>
Date: Tue, 16 May 2006 02:05:50 +0000 (-0700)
Subject: builtin-diff: fix comparison between two blobs.
X-Git-Tag: v1.4.0-rc1~138
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e4e23f3a1c7734cdad60ba1274487ee6e2198de3;p=git.git

builtin-diff: fix comparison between two blobs.

The code forgot that setup_revisions() leaves parsed object
names in reverse in the list.

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

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