diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 17:04:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 17:04:38 (GMT) |
| commit | 8faff3899e1fdefbdd143eaf5ce3b96532205bc7 (patch) | |
| tree | d42f26e57cc524498fb3e49a9897b413d46a5e31 /pack-objects.h | |
| parent | ef8f6210457a3af5a1c36ba066cb4f2b5a8529fa (diff) | |
| parent | f66e0401abaa884aa91100b4c155c4d042c47e0d (diff) | |
| download | git-8faff3899e1fdefbdd143eaf5ce3b96532205bc7.zip git-8faff3899e1fdefbdd143eaf5ce3b96532205bc7.tar.gz git-8faff3899e1fdefbdd143eaf5ce3b96532205bc7.tar.bz2 | |
Merge branch 'jk/optim-in-pack-idx-conversion'
Code clean-up.
* jk/optim-in-pack-idx-conversion:
pack-objects: avoid pointless oe_map_new_pack() calls
Diffstat (limited to 'pack-objects.h')
| -rw-r--r-- | pack-objects.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pack-objects.h b/pack-objects.h index 6fe6ae5..d3975e0 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -251,12 +251,21 @@ static inline void oe_set_in_pack(struct packing_data *pack, struct object_entry *e, struct packed_git *p) { - if (!p->index) + if (pack->in_pack_by_idx) { + if (p->index) { + e->in_pack_idx = p->index; + return; + } + /* + * We're accessing packs by index, but this pack doesn't have + * an index (e.g., because it was added since we created the + * in_pack_by_idx array). Bail to oe_map_new_pack(), which + * will convert us to using the full in_pack array, and then + * fall through to our in_pack handling. + */ oe_map_new_pack(pack); - if (pack->in_pack_by_idx) - e->in_pack_idx = p->index; - else - pack->in_pack[e - pack->objects] = p; + } + pack->in_pack[e - pack->objects] = p; } static inline struct object_entry *oe_delta( |