pull: don't say that merge is "the default strategy"

[thirdparty/git.git] / cache-tree.c

diff --git a/cache-tree.c b/cache-tree.c
index 45e58666afcb49193f1545fa3ca6aea165c60629..90919f9e3454791e2132236a2319b5f51c9c1d41 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -237,6 +237,11 @@ int cache_tree_fully_valid(struct cache_tree *it)
        return 1;
 }
 
+static int must_check_existence(const struct cache_entry *ce)
+{
+       return !(has_promisor_remote() && ce_skip_worktree(ce));
+}
+
 static int update_one(struct cache_tree *it,
                      struct cache_entry **cache,
                      int entries,
@@ -378,8 +383,7 @@ static int update_one(struct cache_tree *it,
                }
 
                ce_missing_ok = mode == S_IFGITLINK || missing_ok ||
-                       (has_promisor_remote() &&
-                        ce_skip_worktree(ce));
+                       !must_check_existence(ce);
                if (is_null_oid(oid) ||
                    (!ce_missing_ok && !has_object_file(oid))) {
                        strbuf_release(&buffer);
@@ -461,11 +465,12 @@ int cache_tree_update(struct index_state *istate, int flags)
        if (i)
                return i;
 
-       ensure_full_index(istate);
-
        if (!istate->cache_tree)
                istate->cache_tree = cache_tree();
 
+       if (!(flags & WRITE_TREE_MISSING_OK) && has_promisor_remote())
+               prefetch_cache_entries(istate, must_check_existence);
+
        trace_performance_enter();
        trace2_region_enter("cache_tree", "update", the_repository);
        i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,