summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:15:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:15:58 (GMT)
commit36d767d02e12c1ff991511b7bd8c1d023340f2ca (patch)
tree028b22c2a0761e229d9c02e29870d2009e274bfa /builtin
parent5a0cc8aca797dbd7d2be3b67458ff880ed45cddf (diff)
parent6b89a34c89fc763292f06012318b852b74825619 (diff)
downloadgit-36d767d02e12c1ff991511b7bd8c1d023340f2ca.zip
git-36d767d02e12c1ff991511b7bd8c1d023340f2ca.tar.gz
git-36d767d02e12c1ff991511b7bd8c1d023340f2ca.tar.bz2
Merge branch 'ab/commit-graph-progress'
Generation of (experimental) commit-graph files have so far been fairly silent, even though it takes noticeable amount of time in a meaningfully large repository. The users will now see progress output. * ab/commit-graph-progress: gc: fix regression in 7b0f229222 impacting --quiet commit-graph verify: add progress output commit-graph write: add progress output
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit-graph.c5
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/gc.c3
3 files changed, 6 insertions, 4 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 0bf0c48..bc0fa9b 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -151,7 +151,7 @@ static int graph_write(int argc, const char **argv)
opts.obj_dir = get_object_directory();
if (opts.reachable) {
- write_commit_graph_reachable(opts.obj_dir, opts.append);
+ write_commit_graph_reachable(opts.obj_dir, opts.append, 1);
return 0;
}
@@ -171,7 +171,8 @@ static int graph_write(int argc, const char **argv)
write_commit_graph(opts.obj_dir,
pack_indexes,
commit_hex,
- opts.append);
+ opts.append,
+ 1);
string_list_clear(&lines, 0);
return 0;
diff --git a/builtin/commit.c b/builtin/commit.c
index b57d8e4..3f33ae6 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1654,7 +1654,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);
+ write_commit_graph_reachable(get_object_directory(), 0, 0);
rerere(0);
run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
diff --git a/builtin/gc.c b/builtin/gc.c
index 2b59226..6591ddb 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -646,7 +646,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
clean_pack_garbage();
if (gc_write_commit_graph)
- write_commit_graph_reachable(get_object_directory(), 0);
+ write_commit_graph_reachable(get_object_directory(), 0,
+ !quiet && !daemonized);
if (auto_gc && too_many_loose_objects())
warning(_("There are too many unreachable loose objects; "