summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-12-21 06:20:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-21 22:36:28 (GMT)
commit9d98bbf5785708da4effc9b8f34ba6e18d726625 (patch)
tree26258229df1ac0124b99f7d0005fb00ea6db77fc /cache.h
parentf4015337daf130944393296550dd7d8a9c172325 (diff)
downloadgit-9d98bbf5785708da4effc9b8f34ba6e18d726625.zip
git-9d98bbf5785708da4effc9b8f34ba6e18d726625.tar.gz
git-9d98bbf5785708da4effc9b8f34ba6e18d726625.tar.bz2
pack-revindex: store entries directly in packed_git
A pack_revindex struct has two elements: the revindex entries themselves, and a pointer to the packed_git. We need both to do lookups, because only the latter knows things like the number of objects in the pack. Now that packed_git contains the pack_revindex struct it's just as easy to pass around the packed_git itself, and we do not need the extra back-pointer. We can instead just store the entries directly in the pack. All functions which took a pack_revindex now just take a packed_git. We still lazy-load in find_pack_revindex, so most callers are unaffected. The exception is the bitmap code, which computes the revindex and caches the pointer when we load the bitmaps. We can continue to load, drop the extra cache pointer, and just access bitmap_git.pack.revindex directly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 202ab59..6603787 100644
--- a/cache.h
+++ b/cache.h
@@ -1118,7 +1118,7 @@ extern struct packed_git {
pack_keep:1,
do_not_close:1;
unsigned char sha1[20];
- struct pack_revindex reverse_index;
+ struct revindex_entry *revindex;
/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
} *packed_git;