diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:57 +0900 |
| commit | caf150ce7d60e4070292226ec208478b801b8d4b (patch) | |
| tree | 4468512d9f8492843cc7b4a6091790e513acde9f /commit-graph.c | |
| parent | Merge branch 'ms/fetch-follow-tag-optim' (diff) | |
| parent | commit-graph: add --[no-]progress to write and verify (diff) | |
| download | tgif-caf150ce7d60e4070292226ec208478b801b8d4b.tar.xz | |
Merge branch 'gs/commit-graph-progress'
* gs/commit-graph-progress:
commit-graph: add --[no-]progress to write and verify
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 19cb1fecfa..c3ba79fe4e 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1994,8 +1994,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; |