mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 05:16:17 +02:00
Code

Merge branch 'tb/commit-graph-no-check-oids' into master 

Fix to the code to produce progress bar, which is new in the
upcoming release.

* tb/commit-graph-no-check-oids:
  commit-graph: fix "Collecting commits from input" progress line
This commit is contained in:
Junio C Hamano 2020-07-15 16:29:45 -07:00
parent 1863dbdde9 862aead24e
commit d1ae8ba096
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/commit-graph.c
View File

@ -251,7 +251,7 @@ static int graph_write(int argc, const char **argv)
} }
} }
stop_progress(&progress);
} }
if (write_commit_graph(odb, if (write_commit_graph(odb,
@ -264,8 +264,6 @@ static int graph_write(int argc, const char **argv)
cleanup: cleanup:
string_list_clear(&pack_indexes, 0); string_list_clear(&pack_indexes, 0);
strbuf_release(&buf); strbuf_release(&buf);
if (progress)
stop_progress(&progress);
return result; return result;
} }