diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 10:15:58 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 10:15:58 +0300 |
commit | 36d767d02e12c1ff991511b7bd8c1d023340f2ca (patch) | |
tree | 028b22c2a0761e229d9c02e29870d2009e274bfa /builtin/gc.c | |
parent | 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf (diff) | |
parent | 6b89a34c89fc763292f06012318b852b74825619 (diff) |
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/gc.c')
-rw-r--r-- | builtin/gc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 2b592260e9a..6591ddbe83c 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; " |