diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
| commit | df0c308c1a165e277ef3a7b8ae1457b926936d99 (patch) | |
| tree | 6964b83ee77096a6895e26d6ea2e444974dd0ec8 /commit-graph.c | |
| parent | 75405e72703e2205eac2585e0c09a3e9751720f2 (diff) | |
| parent | bf6d819bc1589a41fbd4c8d9f55f0a6ebd6ef86f (diff) | |
| download | git-df0c308c1a165e277ef3a7b8ae1457b926936d99.tar.gz | |
Merge branch 'ab/progress-users-adjust-counters'
The code to show progress indicator in a few code paths did not
cover between 0-100%, which has been corrected.
* ab/progress-users-adjust-counters:
entry: show finer-grained counter in "Filtering content" progress line
commit-graph: fix bogus counter in "Scanning merged commits" progress line
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index 00614acd65..4617059220 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2125,7 +2125,7 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx) ctx->num_extra_edges = 0; for (i = 0; i < ctx->commits.nr; i++) { - display_progress(ctx->progress, i); + display_progress(ctx->progress, i + 1); if (i && oideq(&ctx->commits.list[i - 1]->object.oid, &ctx->commits.list[i]->object.oid)) { |