]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/sparse-vs-split-index'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:01 +0000 (14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Feb 2022 22:21:01 +0000 (14:21 -0800)
Mark in various places in the code that the sparse index and the
split index features are mutually incompatible.

* js/sparse-vs-split-index:
  split-index: it really is incompatible with the sparse index
  t1091: disable split index
  sparse-index: sparse index is disallowed when split index is active

1  2 
read-cache.c
t/t1091-sparse-checkout-builtin.sh

diff --cc read-cache.c
Simple merge
Simple merge