]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/sparse-reset-checkout-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2022 20:07:04 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2022 20:07:04 +0000 (13:07 -0700)
Fixes to sparse index compatibility work for "reset" and "checkout"
commands.

* vd/sparse-reset-checkout-fixes:
  unpack-trees: unpack new trees as sparse directories
  cache.h: create 'index_name_pos_sparse()'
  oneway_diff: handle removed sparse directories
  checkout: fix nested sparse directory diff in sparse index

1  2 
builtin/checkout.c
cache.h
read-cache.c
t/t1092-sparse-checkout-compatibility.sh
unpack-trees.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc unpack-trees.c
Simple merge