From: Junio C Hamano <junkio@cox.net>
Date: Thu, 10 Aug 2006 07:50:15 +0000 (-0700)
Subject: Fix git-diff A...B
X-Git-Tag: v1.4.2~22
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=306ea2df03322ac8c29f4eb5a968acb7ef3c8f72;p=git.git

Fix git-diff A...B

Commit 9919f41 meant to make git-diff A...B to (usually) mean
"git-diff `git-merge-base A B` B", but it got the parameters wrong
and ended up showing "git-diff `git-merge-base A B` A" by mistake.

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

diff --git a/builtin-diff.c b/builtin-diff.c
index dd9886c6e..a090e298a 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -349,6 +349,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 		 * A and B.  We have ent[0] == merge-base, ent[1] == A,
 		 * and ent[2] == B.  Show diff between the base and B.
 		 */
+		ent[1] = ent[2];
 		return builtin_diff_tree(&rev, argc, argv, ent);
 	}
 	else