diff options
author | Christian Couder <christian.couder@gmail.com> | 2019-06-25 15:40:31 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-06-25 14:05:37 -0700 |
commit | b14ed5adaf87c5943433fd6b1d2cbe8c060f9264 (patch) | |
tree | e7d525f2956fa56ef545ae2d8495fbe36363428e /cache-tree.c | |
parent | promisor-remote: use repository_format_partial_clone (diff) | |
download | tgif-b14ed5adaf87c5943433fd6b1d2cbe8c060f9264.tar.xz |
Use promisor_remote_get_direct() and has_promisor_remote()
Instead of using the repository_format_partial_clone global
and fetch_objects() directly, let's use has_promisor_remote()
and promisor_remote_get_direct().
This way all the configured promisor remotes will be taken
into account, not only the one specified by
extensions.partialClone.
Also when cloning or fetching using a partial clone filter,
remote.origin.promisor will be set to "true" instead of
setting extensions.partialClone to "origin". This makes it
possible to use many promisor remote just by fetching from
them.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache-tree.c')
-rw-r--r-- | cache-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index b13bfaf71e..64c285a746 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -5,6 +5,7 @@ #include "cache-tree.h" #include "object-store.h" #include "replace-object.h" +#include "promisor-remote.h" #ifndef DEBUG #define DEBUG 0 @@ -357,7 +358,7 @@ static int update_one(struct cache_tree *it, } ce_missing_ok = mode == S_IFGITLINK || missing_ok || - (repository_format_partial_clone && + (has_promisor_remote() && ce_skip_worktree(ce)); if (is_null_oid(oid) || (!ce_missing_ok && !has_object_file(oid))) { |