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>
Junio C Hamano committed
Aug 10, 2006 at 00:50 UTC
306ea2df03322ac8c29f4eb5a968acb7ef3c8f72
1 file changed
+1
builtin-diff.c
+1
@@ -349,6 +349,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
349
* A and B. We have ent[0] == merge-base, ent[1] == A,
350
* and ent[2] == B. Show diff between the base and B.
351
*/
352
+ ent[1] = ent[2];
353
return builtin_diff_tree(&rev, argc, argv, ent);
354
}
355
else