diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-03-05 18:43:03 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-05 18:43:03 (GMT) |
commit | e8e71848ea866d7dc34eacffc20b9c3826ae29a1 (patch) | |
tree | 3baa258f1b1a5671948b7677169b0af70a06dc06 /midx.c | |
parent | a0ab37de61c9ac7f57105d6b170947abaf1b642c (diff) | |
parent | 2fecc48cade44529dff2594eadfb294643cdc24d (diff) | |
download | git-e8e71848ea866d7dc34eacffc20b9c3826ae29a1.zip git-e8e71848ea866d7dc34eacffc20b9c3826ae29a1.tar.gz git-e8e71848ea866d7dc34eacffc20b9c3826ae29a1.tar.bz2 |
Merge branch 'jk/nth-packed-object-id'
Code cleanup to use "struct object_id" more by replacing use of
"char *sha1"
* jk/nth-packed-object-id:
packfile: drop nth_packed_object_sha1()
packed_object_info(): use object_id internally for delta base
packed_object_info(): use object_id for returning delta base
pack-check: push oid lookup into loop
pack-check: convert "internal error" die to a BUG()
pack-bitmap: use object_id when loading on-disk bitmaps
pack-objects: use object_id struct in pack-reuse code
pack-objects: convert oe_set_delta_ext() to use object_id
pack-objects: read delta base oid into object_id struct
nth_packed_object_oid(): use customary integer return
Diffstat (limited to 'midx.c')
-rw-r--r-- | midx.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -534,7 +534,7 @@ static void fill_pack_entry(uint32_t pack_int_id, uint32_t cur_object, struct pack_midx_entry *entry) { - if (!nth_packed_object_oid(&entry->oid, p, cur_object)) + if (nth_packed_object_id(&entry->oid, p, cur_object) < 0) die(_("failed to locate object %d in packfile"), cur_object); entry->pack_int_id = pack_int_id; |