diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:14 -0700 |
| commit | d80bea479daa1d49a6b2332c4731e2647c896c29 (patch) | |
| tree | c847e5c1a66a9a9e72d3b4afb3dae893081a70ca /object.c | |
| parent | 0cc4dcacb323cfd1cfe6e6a750ecc86eb215180d (diff) | |
| parent | c752ad09c4ea479e8d54d08637cc0e5709723208 (diff) | |
| download | git-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.c')
| -rw-r--r-- | object.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -157,13 +157,13 @@ void *create_object(struct repository *r, const struct object_id *oid, void *o) return 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) { if (obj->type == type) return obj; else if (obj->type == OBJ_NONE) { if (type == OBJ_COMMIT) - init_commit_node(r, (struct commit *) obj); + init_commit_node((struct commit *) obj); else obj->type = type; return obj; |