From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Feb 2022 22:21:01 +0000 (-0800)
Subject: Merge branch 'js/sparse-vs-split-index'
X-Git-Tag: v2.36.0-rc0~170
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b82b936e30cc159afd56bbd39fe632008969773;p=thirdparty%2Fgit.git

Merge branch 'js/sparse-vs-split-index'

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
---

1b82b936e30cc159afd56bbd39fe632008969773