unpack-trees: take care to propagate the split-index flag
When copying the `split_index` structure from one index structure to another, we need to propagate the `SPLIT_INDEX_ORDERED` flag, too, if it is set, otherwise Git might forget to write the shared index when that is actually needed. It just so _happens_ that in many instances when `unpack_trees()` is called, the result causes the shared index to be written anyway, but there are edge cases when that is not so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 26, 2023 at 22:45 UTC
061dd722dcc7a0e1f506c426ff6591b0ca8f14b6
1 file changed
+2
unpack-trees.c
+2
@@ -1916,6 +1916,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1916
* create a new one.
1917
*/
1918
o->result.split_index = o->src_index->split_index;
1919
+ if (o->src_index->cache_changed & SPLIT_INDEX_ORDERED)
1920
+ o->result.cache_changed |= SPLIT_INDEX_ORDERED;
1921
o->result.split_index->refcount++;
1922
} else {
1923
o->result.split_index = init_split_index(&o->result);