From: Johannes Schindelin Date: Sun, 26 Mar 2023 22:45:43 +0000 (+0000) Subject: unpack-trees: take care to propagate the split-index flag X-Git-Tag: v2.41.0-rc0~117^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=061dd722dcc7a0e1f506c426ff6591b0ca8f14b6;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/unpack-trees.c b/unpack-trees.c index 90b92114be..ca5e47c77c 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1916,6 +1916,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * create a new one. */ o->result.split_index = o->src_index->split_index; + if (o->src_index->cache_changed & SPLIT_INDEX_ORDERED) + o->result.cache_changed |= SPLIT_INDEX_ORDERED; o->result.split_index->refcount++; } else { o->result.split_index = init_split_index(&o->result);