From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Nov 2021 20:53:56 +0000 (-0800)
Subject: Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
X-Git-Tag: v2.35.0-rc0~57^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea6ae410bedd6eee1968d24aa267b22ce7a0305a;p=thirdparty%2Fgit.git

Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame

* vd/sparse-reset:
  unpack-trees: improve performance of next_cache_entry
  reset: make --mixed sparse-aware
  reset: make sparse-aware (except --mixed)
  reset: integrate with sparse index
  reset: expand test coverage for sparse checkouts
  sparse-index: update command for expand/collapse test
  reset: preserve skip-worktree bit in mixed reset
  reset: rename is_missing to !is_in_reset_tree
---

ea6ae410bedd6eee1968d24aa267b22ce7a0305a