diff options
| author | Garima Singh <garima.singh@microsoft.com> | 2019-08-26 19:29:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-19 00:23:09 +0300 |
| commit | 7371612255492f062ee905e6d88c6234c6d4752a (patch) | |
| tree | 5169ddfc0bdd79a5fba40c9cc008a025edb4fa26 /commit-graph.c | |
| parent | f1d4a28250629ae469fc5dd59ab843cb2fd68e12 (diff) | |
commit-graph: add --[no-]progress to write and verify
Add --[no-]progress to git commit-graph write and verify.
The progress feature was introduced in 7b0f229
("commit-graph write: add progress output", 2018-09-17) but
the ability to opt-out was overlooked.
Signed-off-by: Garima Singh <garima.singh@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..1f23e90567 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1992,8 +1992,10 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH) return verify_commit_graph_error; - progress = start_progress(_("Verifying commits in commit graph"), - g->num_commits); + if (flags & COMMIT_GRAPH_WRITE_PROGRESS) + progress = start_progress(_("Verifying commits in commit graph"), + g->num_commits); + for (i = 0; i < g->num_commits; i++) { struct commit *graph_commit, *odb_commit; struct commit_list *graph_parents, *odb_parents; |