aboutsummaryrefslogtreecommitdiffstats
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-06 22:09:13 -0700
committerJunio C Hamano <gitster@pobox.com>2020-07-06 22:09:14 -0700
commitd80bea479daa1d49a6b2332c4731e2647c896c29 (patch)
treec847e5c1a66a9a9e72d3b4afb3dae893081a70ca /object.h
parent0cc4dcacb323cfd1cfe6e6a750ecc86eb215180d (diff)
parentc752ad09c4ea479e8d54d08637cc0e5709723208 (diff)
downloadgit-d80bea479daa1d49a6b2332c4731e2647c896c29.tar.gz
Merge branch 'ak/commit-graph-to-slab'
A few fields in "struct commit" that do not have to always be present have been moved to commit slabs. * ak/commit-graph-to-slab: commit-graph: minimize commit_graph_data_slab access commit: move members graph_pos, generation to a slab commit-graph: introduce commit_graph_data_slab object: drop parsed_object_pool->commit_count
Diffstat (limited to 'object.h')
-rw-r--r--object.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/object.h b/object.h
index b22328b838..532d7d7f28 100644
--- a/object.h
+++ b/object.h
@@ -15,7 +15,6 @@ struct parsed_object_pool {
struct alloc_state *commit_state;
struct alloc_state *tag_state;
struct alloc_state *object_state;
- unsigned commit_count;
/* parent substitutions from .git/info/grafts and .git/shallow */
struct commit_graft **grafts;
@@ -121,7 +120,7 @@ struct object *lookup_object(struct repository *r, const struct object_id *oid);
void *create_object(struct repository *r, const struct object_id *oid, void *obj);
-void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
+void *object_as_type(struct object *obj, enum object_type type, int quiet);
/*
* Returns the object, having parsed it to find out what it is.