Merge branch 'tb/commit-graph-split-strategy'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:52 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 May 2020 20:39:52 +0000 (13:39 -0700)
commit6a1c17d05b0e67fa5f9661f492f407b984496b27
tree2abe4b8ae7cb8eb78e93ca07cd1e9426a876297d
parent2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f
parentdbd5e0a1861c5bb1446e5518173aa1760c6617b0
Merge branch 'tb/commit-graph-split-strategy'

"git commit-graph write" learned different ways to write out split
files.

* tb/commit-graph-split-strategy:
  Revert "commit-graph.c: introduce '--[no-]check-oids'"
  commit-graph.c: introduce '--[no-]check-oids'
  commit-graph.h: replace 'commit_hex' with 'commits'
  oidset: introduce 'oidset_size'
  builtin/commit-graph.c: introduce split strategy 'replace'
  builtin/commit-graph.c: introduce split strategy 'no-merge'
  builtin/commit-graph.c: support for '--split[=<strategy>]'
  t/helper/test-read-graph.c: support commit-graph chains
builtin/commit-graph.c
commit-graph.c
oidset.h
t/t5318-commit-graph.sh
t/t5324-split-commit-graph.sh