Merge branch 'mt/parallel-checkout-part-3'
commita737e1f1d25747481bd4925555006f569e461117
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (16 21:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (16 21:05 +0900)
treef7f7cb6a78b9e67f9eb6e9c35cdc85758c0ebd25
parent644f4a20468da89c1325a539c0521336f7835a64
parent87094fc2daa9613c2fad454dbb068a8f23ce8de8
Merge branch 'mt/parallel-checkout-part-3'

The final part of "parallel checkout".

* mt/parallel-checkout-part-3:
  ci: run test round with parallel-checkout enabled
  parallel-checkout: add tests related to .gitattributes
  t0028: extract encoding helpers to lib-encoding.sh
  parallel-checkout: add tests related to path collisions
  parallel-checkout: add tests for basic operations
  checkout-index: add parallel checkout support
  builtin/checkout.c: complete parallel checkout support
  make_transient_cache_entry(): optionally alloc from mem_pool
builtin/checkout-index.c
builtin/checkout.c
builtin/difftool.c
cache.h
ci/run-build-and-tests.sh
read-cache.c
t/README
unpack-trees.c