development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

alloc: add repository argument to alloc_commit_node

Browse source 
This is a small mechanical change; it doesn't change the
implementation to handle repositories other than the_repository yet.
Use a macro to catch callers passing a repository other than
the_repository at compile time.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-05-08 12:37:29 -07:00 committed by Junio C Hamano
parent cf7203bdc6
commit 8ba0e5ec57
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
alloc.c
View file

@ -88,7 +88,7 @@ unsigned int alloc_commit_index(void)
return count++;
}
void *alloc_commit_node(void)
void *alloc_commit_node_the_repository(void)
{
struct commit *c = alloc_node(&commit_state, sizeof(struct commit));
c->object.type = OBJ_COMMIT;

2
blame.c
View file

@ -161,7 +161,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
read_cache();
time(&now);
commit = alloc_commit_node();
commit = alloc_commit_node(the_repository);
commit->object.parsed = 1;
commit->date = now;
parent_tail = &commit->parents;

3
cache.h
View file

@ -1768,7 +1768,8 @@ void encode_85(char *buf, const unsigned char *data, int bytes);
extern void *alloc_blob_node_the_repository(void);
#define alloc_tree_node(r) alloc_tree_node_##r()
extern void *alloc_tree_node_the_repository(void);
extern void *alloc_commit_node(void);
#define alloc_commit_node(r) alloc_commit_node_##r()
extern void *alloc_commit_node_the_repository(void);
extern void *alloc_tag_node(void);
extern void *alloc_object_node(void);
extern void alloc_report(void);

2
commit.c
View file

@ -51,7 +51,7 @@ struct commit *lookup_commit(const struct object_id *oid)
struct object *obj = lookup_object(oid->hash);
if (!obj)
return create_object(the_repository, oid->hash,
alloc_commit_node());
alloc_commit_node(the_repository));
return object_as_type(obj, OBJ_COMMIT, 0);
}

2
merge-recursive.c
View file

@ -98,7 +98,7 @@ static struct tree *shift_tree_object(struct tree *one, struct tree *two,
static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
{
struct commit *commit = alloc_commit_node();
struct commit *commit = alloc_commit_node(the_repository);
set_merge_remote_desc(commit, comment, (struct object *)commit);
commit->tree = tree;