From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Aug 2021 20:39:14 +0000 (-0700)
Subject: Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
X-Git-Tag: v2.34.0-rc0~145^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=716f68ec33e3506babee03c4df497a7e211220ee;p=thirdparty%2Fgit.git

Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files

* ds/add-with-sparse-index:
  add: remove ensure_full_index() with --renormalize
  add: ignore outside the sparse-checkout in refresh()
  pathspec: stop calling ensure_full_index
  add: allow operating on a sparse-only index
  t1092: test merge conflicts outside cone
---

716f68ec33e3506babee03c4df497a7e211220ee