X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff.c;h=9c8c295732bf12990b8324bf75968fd68dd41d59;hb=0eb5ebc1d862737ea2b313d0d77d120b3d114099;hp=35da366f46009eab8eab693f7f56403d91d5d677;hpb=635536488c3efcf8495333b6a94e3e33c36fc055;p=git.git diff --git a/builtin-diff.c b/builtin-diff.c index 35da366f4..9c8c29573 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -177,10 +177,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;