Browse Source

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
maint
Junio C Hamano 5 years ago
parent
commit
cda8faa37e
  1. 2
      builtin/commit-graph.c
  2. 2
      commit-graph.c

2
builtin/commit-graph.c

@ -251,6 +251,8 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix) @@ -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);

2
commit-graph.c

@ -1050,7 +1050,7 @@ static void close_reachable(struct write_commit_graph_context *ctx) @@ -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]);

Loading…
Cancel
Save