undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit-graph.c: extract 'refs_cb_data'

Browse Source 
In subsequent patches, we are going to update a progress meter when
'add_ref_to_set()' is called, and need a convenient way to pass a
'struct progress *' in from the caller.

Introduce 'refs_cb_data' as a catch-all for parameters that
'add_ref_to_set' may need, and wrap the existing single parameter in
that struct.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau 2020-05-04 19:13:35 -06:00 committed by Junio C Hamano
parent b34789c0b0
commit 1fe10844ca
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
commit-graph.c
View File

@ -1318,13 +1318,17 @@ static void compute_bloom_filters(struct write_commit_graph_context *ctx)
stop_progress(&progress); stop_progress(&progress);
} }
struct refs_cb_data {
struct oidset *commits;
};
static int add_ref_to_set(const char *refname, static int add_ref_to_set(const char *refname,
const struct object_id *oid, const struct object_id *oid,
int flags, void *cb_data) int flags, void *cb_data)
{ {
struct oidset *commits = (struct oidset *)cb_data; struct refs_cb_data *data = (struct refs_cb_data *)cb_data;
oidset_insert(commits, oid); oidset_insert(data->commits, oid);
return 0; return 0;
} }
@ -1333,9 +1337,13 @@ int write_commit_graph_reachable(struct object_directory *odb,
const struct split_commit_graph_opts *split_opts) const struct split_commit_graph_opts *split_opts)
{ {
struct oidset commits = OIDSET_INIT; struct oidset commits = OIDSET_INIT;
struct refs_cb_data data;
int result; int result;
for_each_ref(add_ref_to_set, &commits); memset(&data, 0, sizeof(data));
data.commits = &commits;
for_each_ref(add_ref_to_set, &data);
result = write_commit_graph(odb, NULL, &commits, result = write_commit_graph(odb, NULL, &commits,
flags, split_opts); flags, split_opts);