From: Junio C Hamano Date: Fri, 10 Dec 2021 22:35:12 +0000 (-0800) Subject: Merge branch 'vd/sparse-reset' X-Git-Tag: v2.35.0-rc0~105 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0850875fd44a58cd1eae349244327b2eff29fa7;p=thirdparty%2Fgit.git Merge branch 'vd/sparse-reset' Various operating modes of "git reset" have been made to work better with the sparse index. * 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 --- f0850875fd44a58cd1eae349244327b2eff29fa7