diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-05 00:28:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-05 00:28:27 +0300 |
| commit | f315a8b609e0bd99f342fbbe85758fc5b8edd207 (patch) | |
| tree | 23fb56f27079be9ace4ebb0dc8d3a1e575bf448d /unpack-trees.c | |
| parent | f834089925e39cdf786f07757308e14b57973542 (diff) | |
| parent | 061dd722dcc7a0e1f506c426ff6591b0ca8f14b6 (diff) | |
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
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index a75fb9f05b..09d96f8ba1 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1926,6 +1926,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * avoid having to create a new one. */ o->internal.result.split_index = o->src_index->split_index; + if (o->src_index->cache_changed & SPLIT_INDEX_ORDERED) + o->internal.result.cache_changed |= SPLIT_INDEX_ORDERED; o->internal.result.split_index->refcount++; } else { o->internal.result.split_index = |