diff --git a/diff-lib.c b/diff-lib.c
index fdc11732dfbe201119182ff701f7fd40d74d1017..3e4b3b96b71925974eee5f1f691158c314722011 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
}
oldmode = old->ce_mode;
- if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
+ if (mode == oldmode && !hashcmp(sha1, old->sha1) &&
!revs->diffopt.find_copies_harder)
return 0;
}
mark_merge_entries();
- ent = revs->pending_objects->item;
- tree_name = revs->pending_objects->name;
+ ent = revs->pending.objects[0].item;
+ tree_name = revs->pending.objects[0].name;
tree = parse_tree_indirect(ent->sha1);
if (!tree)
return error("bad tree object %s", tree_name);