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>
git-mirror · Aug 10, 2006 · 306ea2d · 306ea2d
1 parent 567a03d
commit 306ea2d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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