diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 11:32:55 +0900 |
| commit | cda8faa37e997f5db3458c1454ffe70f5c460d2a (patch) | |
| tree | d042955b65bdf650910f69cee4b6c372becb9788 | |
| parent | 36d2fca82bfad5aac326e624b72445eefeac11a3 (diff) | |
| parent | dd2e50a84ea431a6cec69f37251f29bf3cfcbb68 (diff) | |
| download | git-cda8faa37e997f5db3458c1454ffe70f5c460d2a.tar.gz | |
Merge branch 'jk/commit-graph-cleanup'
A pair of small fixups to "git commit-graph" have been applied.
* jk/commit-graph-cleanup:
commit-graph: turn off save_commit_buffer
commit-graph: don't show progress percentages while expanding reachable commits
| -rw-r--r-- | builtin/commit-graph.c | 2 | ||||
| -rw-r--r-- | commit-graph.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 57863619b7..052696f1af 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -251,6 +251,8 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix) builtin_commit_graph_usage, PARSE_OPT_STOP_AT_NON_OPTION); + save_commit_buffer = 0; + if (argc > 0) { if (!strcmp(argv[0], "read")) return graph_read(argc, argv); diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..5da0e16d12 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1050,7 +1050,7 @@ static void close_reachable(struct write_commit_graph_context *ctx) if (ctx->report_progress) ctx->progress = start_delayed_progress( _("Expanding reachable commits in commit graph"), - ctx->oids.nr); + 0); for (i = 0; i < ctx->oids.nr; i++) { display_progress(ctx->progress, i + 1); commit = lookup_commit(ctx->r, &ctx->oids.list[i]); |