diff options
| author | Matt McCutchen <matt@mattmccutchen.net> | 2008-10-11 01:56:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-07 22:57:57 (GMT) |
| commit | dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5 (patch) | |
| tree | 8171a2c869f6b1ef3a8a849fab1af952874d77de | |
| parent | 3927bbe9a4d4033551dea39ac1abb9cdc45d822c (diff) | |
| download | git-dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5.zip git-dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5.tar.gz git-dbc2fb6b841dd3a72c52a5a161e2362a26fc65f5.tar.bz2 | |
"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>
| -rw-r--r-- | builtin-diff.c | 4 | ||||
| -rwxr-xr-x | t/t4013-diff-various.sh | 1 | ||||
| -rw-r--r-- | t/t4013/diff.diff_master_master^_side | 29 |
3 files changed, 31 insertions, 3 deletions
diff --git a/builtin-diff.c b/builtin-diff.c index 26cf678..375a0d3 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -175,10 +175,8 @@ static int builtin_diff_combined(struct rev_info *revs, if (!revs->dense_combined_merges && !revs->combine_merges) revs->dense_combined_merges = revs->combine_merges = 1; parent = xmalloc(ents * sizeof(*parent)); - /* Again, the revs are all reverse */ for (i = 0; i < ents; i++) - hashcpy((unsigned char *)(parent + i), - ent[ents - 1 - i].item->sha1); + hashcpy((unsigned char *)(parent + i), ent[i].item->sha1); diff_tree_combined(parent[0], parent + 1, ents - 1, revs->dense_combined_merges, revs); return 0; diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 9337b81..99d9e0b 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -258,6 +258,7 @@ diff --patch-with-stat -r initial..side diff --patch-with-raw -r initial..side diff --name-status dir2 dir diff --no-index --name-status dir2 dir +diff master master^ side EOF test_done diff --git a/t/t4013/diff.diff_master_master^_side b/t/t4013/diff.diff_master_master^_side new file mode 100644 index 0000000..50ec9ca --- /dev/null +++ b/t/t4013/diff.diff_master_master^_side @@ -0,0 +1,29 @@ +$ git diff master master^ side +diff --cc dir/sub +index cead32e,7289e35..992913c +--- a/dir/sub ++++ b/dir/sub +@@@ -1,6 -1,4 +1,8 @@@ + A + B + +C + +D + +E + +F ++ 1 ++ 2 +diff --cc file0 +index b414108,f4615da..10a8a9f +--- a/file0 ++++ b/file0 +@@@ -1,6 -1,6 +1,9 @@@ + 1 + 2 + 3 + +4 + +5 + +6 ++ A ++ B ++ C +$ |