]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/sparse-stash'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:58 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:58 +0000 (15:26 -0700)
Teach "git stash" to work better with sparse index entries.

* vd/sparse-stash:
  unpack-trees: preserve index sparsity
  stash: apply stash using 'merge_ort_nonrecursive()'
  read-cache: set sparsity when index is new
  sparse-index: expose 'is_sparse_index_allowed()'
  stash: integrate with sparse index
  stash: expand sparse-checkout compatibility testing


Trivial merge