mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-graph: use raw_object_store when closing

Browse Source 
The close_commit_graph() method took a repository struct, but then
only uses the raw_object_store within. Change the function prototype
to make the method more flexible.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2019-05-17 11:41:47 -07:00 committed by Junio C Hamano
parent 238def57fe
commit c3a3a964b2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commit-graph.c
View File

@ -359,10 +359,10 @@ int generation_numbers_enabled(struct repository *r)
return !!first_generation; return !!first_generation;
} }
void close_commit_graph(struct repository *r) void close_commit_graph(struct raw_object_store *o)
{ {
free_commit_graph(r->objects->commit_graph); free_commit_graph(o->commit_graph);
r->objects->commit_graph = NULL; o->commit_graph = NULL;
} }
static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos) static int bsearch_graph(struct commit_graph *g, struct object_id *oid, uint32_t *pos)
@ -1086,7 +1086,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
stop_progress(&ctx->progress); stop_progress(&ctx->progress);
strbuf_release(&progress_title); strbuf_release(&progress_title);
close_commit_graph(ctx->r); close_commit_graph(ctx->r->objects);
finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC); finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
commit_lock_file(&lk); commit_lock_file(&lk);

2
commit-graph.h
View File

@ -82,7 +82,7 @@ int write_commit_graph(const char *obj_dir,
int verify_commit_graph(struct repository *r, struct commit_graph *g); int verify_commit_graph(struct repository *r, struct commit_graph *g);
void close_commit_graph(struct repository *); void close_commit_graph(struct raw_object_store *);
void free_commit_graph(struct commit_graph *); void free_commit_graph(struct commit_graph *);
#endif #endif

2
upload-pack.c
View File

@ -717,7 +717,7 @@ static void deepen_by_rev_list(struct packet_writer *writer, int ac,
{ {
struct commit_list *result; struct commit_list *result;
close_commit_graph(the_repository); close_commit_graph(the_repository->objects);
result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
send_shallow(writer, result); send_shallow(writer, result);
free_commit_list(result); free_commit_list(result);