diff options
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index a26fda3493..3ded68ecb6 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -462,7 +462,7 @@ static int check_updates(struct unpack_trees_options *o, if (should_update_submodules()) load_gitmodules_file(index, &state); - if (has_promisor_remote()) + if (repo_has_promisor_remote(the_repository)) /* * Prefetch the objects that are to be checked out in the loop * below. @@ -1929,6 +1929,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 = |