diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-10 12:36:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-10 12:36:13 -0800 |
| commit | 844a9ce47208de173341525c15a4c8c689dd278e (patch) | |
| tree | d771915b28609179ddf1f3f911bcb30b7019d7cf /diff-lib.c | |
| parent | Merge branch 'dt/fsck-verify-pack-error' (diff) | |
| parent | remote: convert functions to struct object_id (diff) | |
| download | tgif-844a9ce47208de173341525c15a4c8c689dd278e.tar.xz | |
Merge branch 'bc/object-id'
More transition from "unsigned char[40]" to "struct object_id".
This needed a few merge fixups, but is mostly disentangled from other
topics.
* bc/object-id:
remote: convert functions to struct object_id
Remove get_object_hash.
Convert struct object to object_id
Add several uses of get_object_hash.
object: introduce get_object_hash macro.
ref_newer: convert to use struct object_id
push_refs_with_export: convert to struct object_id
get_remote_heads: convert to struct object_id
parse_fetch: convert to use struct object_id
add_sought_entry_mem: convert to struct object_id
Convert struct ref to use object_id.
sha1_file: introduce has_object_file helper.
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 241a8435eb..bc49c708c1 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -493,7 +493,7 @@ int run_diff_index(struct rev_info *revs, int cached) struct object_array_entry *ent; ent = revs->pending.objects; - if (diff_cache(revs, ent->item->sha1, ent->name, cached)) + if (diff_cache(revs, ent->item->oid.hash, ent->name, cached)) exit(128); diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/"); |