]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/commit-graph-delay-gen-progress'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:43 +0000 (13:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:43 +0000 (13:11 -0800)
One kind of progress messages were always given during commit-graph
generation, instead of following the "if it takes more than two
seconds, show progress" pattern, which has been corrected.

* ds/commit-graph-delay-gen-progress:
  commit-graph: use start_delayed_progress()
  progress: create GIT_PROGRESS_DELAY

1  2 
Documentation/git.txt
commit-graph.c
t/t5318-commit-graph.sh

Simple merge
diff --cc commit-graph.c
Simple merge
Simple merge