Code

"git diff <tree>{3,}": do not reverse order of arguments
authorMatt McCutchen <matt@mattmccutchen.net>
Sat, 11 Oct 2008 01:56:15 +0000 (21:56 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 19:36:19 +0000 (12:36 -0700)
commitb75271d93a9e4be960d53fc4f955802530e0e733
tree992479e9107dc2186498b675caf0ffda318a86b3
parentf285a2d7ed6548666989406de8f0e7233eb84368
"git diff <tree>{3,}": do not reverse order of arguments

According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168,
"git diff" with three or more trees expects the merged tree first followed by
the parents, in order.  However, this command reversed the order of its
arguments, resulting in confusing diffs.  A comment /* Again, the revs are all
reverse */ suggested there was a reason for this, but I can't figure out the
reason, so I removed the reversal of the arguments.  Test case included.

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
builtin-diff.c
t/t4013-diff-various.sh
t/t4013/diff.diff_master_master^_side [new file with mode: 0644]