]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/commit-graph-genno-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:40 +0000 (17:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:40 +0000 (17:21 -0800)
Fix incremental update of commit-graph file around corrected commit
date data.

* ds/commit-graph-genno-fix:
  commit-graph: prepare commit graph
  commit-graph: be extra careful about mixed generations
  commit-graph: compute generations separately
  commit-graph: validate layers for generation data
  commit-graph: always parse before commit_graph_data_at()
  commit-graph: use repo_parse_commit

1  2 
commit-graph.c
commit.h

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