From 306ea2df03322ac8c29f4eb5a968acb7ef3c8f72 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Aug 2006 00:50:15 -0700 Subject: 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 diff --git a/builtin-diff.c b/builtin-diff.c index dd9886c..a090e29 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 -- cgit v0.10.2-6-g49f6