diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:03 -0800 |
| commit | e8e71848ea866d7dc34eacffc20b9c3826ae29a1 (patch) | |
| tree | 3baa258f1b1a5671948b7677169b0af70a06dc06 /pack-objects.h | |
| parent | a0ab37de61c9ac7f57105d6b170947abaf1b642c (diff) | |
| parent | 2fecc48cade44529dff2594eadfb294643cdc24d (diff) | |
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 'pack-objects.h')
| -rw-r--r-- | pack-objects.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-objects.h b/pack-objects.h index d3975e079b..9d88e3e518 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -292,7 +292,7 @@ static inline void oe_set_delta(struct packing_data *pack, void oe_set_delta_ext(struct packing_data *pack, struct object_entry *e, - const unsigned char *sha1); + const struct object_id *oid); static inline struct object_entry *oe_delta_child( const struct packing_data *pack, |