]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
Merge branch 'js/split-index-fixes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Apr 2023 21:28:27 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Apr 2023 21:28:27 +0000 (14:28 -0700)
commitf315a8b609e0bd99f342fbbe85758fc5b8edd207
tree23fb56f27079be9ace4ebb0dc8d3a1e575bf448d
parentf834089925e39cdf786f07757308e14b57973542
parent061dd722dcc7a0e1f506c426ff6591b0ca8f14b6
Merge branch 'js/split-index-fixes'

The index files can become corrupt under certain conditions when
the split-index feature is in use, especially together with
fsmonitor, which have been corrected.

* js/split-index-fixes:
  unpack-trees: take care to propagate the split-index flag
  fsmonitor: avoid overriding `cache_changed` bits
  split-index; stop abusing the `base_oid` to strip the "link" extension
  split-index & fsmonitor: demonstrate a bug
read-cache.c
t/t7527-builtin-fsmonitor.sh
unpack-trees.c