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

commit-graph: collapse parameters into flags

Browse Source 
The write_commit_graph() and write_commit_graph_reachable() methods
currently take two boolean parameters: 'append' and 'report_progress'.
As we update these methods, adding more parameters this way becomes
cluttered and hard to maintain.

Collapse these parameters into a 'flags' parameter, and adjust the
callers to provide flags as necessary.

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-06-12 06:29:38 -07:00
committed by Junio C Hamano
parent e103f7276f
commit 5af8039452
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/commit-graph.c
View File

@ -142,6 +142,7 @@ static int graph_write(int argc, const char **argv)
struct string_list *commit_hex = NULL;
struct string_list lines;
int result = 0;
unsigned int flags = COMMIT_GRAPH_PROGRESS;
static struct option builtin_commit_graph_write_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
@ -166,11 +167,13 @@ static int graph_write(int argc, const char **argv)
die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
if (!opts.obj_dir)
opts.obj_dir = get_object_directory();
if (opts.append)
flags |= COMMIT_GRAPH_APPEND;
read_replace_refs = 0;
if (opts.reachable)
return write_commit_graph_reachable(opts.obj_dir, opts.append, 1);
return write_commit_graph_reachable(opts.obj_dir, flags);
string_list_init(&lines, 0);
if (opts.stdin_packs || opts.stdin_commits) {
@ -190,8 +193,7 @@ static int graph_write(int argc, const char **argv)
if (write_commit_graph(opts.obj_dir,
pack_indexes,
commit_hex,
opts.append,
1))
flags))
result = 1;
UNLEAK(lines);

2
builtin/commit.c
View File

@ -1670,7 +1670,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
"not exceeded, and then \"git reset HEAD\" to recover."));
if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
write_commit_graph_reachable(get_object_directory(), 0, 0))
write_commit_graph_reachable(get_object_directory(), 0))
return 1;
repo_rerere(the_repository, 0);

4
builtin/gc.c
View File

@ -665,8 +665,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
}
if (gc_write_commit_graph &&
write_commit_graph_reachable(get_object_directory(), 0,
!quiet && !daemonized))
write_commit_graph_reachable(get_object_directory(),
!quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0))
return 1;
if (auto_gc && too_many_loose_objects())