]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4108-apply-threeway.sh
Merge branch 'vd/sparse-clean-etc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:05 +0000 (16:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:05 +0000 (16:25 -0800)
commit2f45f3e2bc859e5d5d29ede28de14f073c2dc227
tree5ee746acec3fe482534dbb4c7c8b21c251b47115
parent708cbef33a2c905c920e94b70d0946f9f4ff3a4e
parentb9ca5e26579ceb820103b49648c01187a4a0dddd
Merge branch 'vd/sparse-clean-etc'

"git update-index", "git checkout-index", and "git clean" are
taught to work better with the sparse checkout feature.

* vd/sparse-clean-etc:
  update-index: reduce scope of index expansion in do_reupdate
  update-index: integrate with sparse index
  update-index: add tests for sparse-checkout compatibility
  checkout-index: integrate with sparse index
  checkout-index: add --ignore-skip-worktree-bits option
  checkout-index: expand sparse checkout compatibility tests
  clean: integrate with sparse index
  reset: reorder wildcard pathspec conditions
  reset: fix validation in sparse index test
builtin/clean.c
builtin/reset.c
builtin/update-index.c
read-cache.c
t/t1092-sparse-checkout-compatibility.sh