]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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

1  2 
builtin/clean.c
builtin/reset.c
builtin/update-index.c
read-cache.c
t/t1092-sparse-checkout-compatibility.sh

diff --cc builtin/clean.c
Simple merge
diff --cc builtin/reset.c
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge