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
Родитель 1863dbdde9 862aead24e
Коммит d1ae8ba096
1 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

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