diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-18 18:50:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-18 18:50:09 (GMT) |
| commit | b9ac6c59b82dead613b31a51c8bca4dbd441bcbe (patch) | |
| tree | dc91493ac2c087053c15b7b431da943e7abe701a /cache-tree.c | |
| parent | de67293e74888be95fb499560c1b38fe05b13af7 (diff) | |
| parent | 4ca9474efa4fd431c07a470513e684c5b2eec34c (diff) | |
| download | git-b9ac6c59b82dead613b31a51c8bca4dbd441bcbe.zip git-b9ac6c59b82dead613b31a51c8bca4dbd441bcbe.tar.gz git-b9ac6c59b82dead613b31a51c8bca4dbd441bcbe.tar.bz2 | |
Merge branch 'cc/multi-promisor'
Teach the lazy clone machinery that there can be more than one
promisor remote and consult them in order when downloading missing
objects on demand.
* cc/multi-promisor:
Move core_partial_clone_filter_default to promisor-remote.c
Move repository_format_partial_clone to promisor-remote.c
Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
remote: add promisor and partial clone config to the doc
partial-clone: add multiple remotes in the doc
t0410: test fetching from many promisor remotes
builtin/fetch: remove unique promisor remote limitation
promisor-remote: parse remote.*.partialclonefilter
Use promisor_remote_get_direct() and has_promisor_remote()
promisor-remote: use repository_format_partial_clone
promisor-remote: add promisor_remote_reinit()
promisor-remote: implement promisor_remote_get_direct()
Add initial support for many promisor remotes
fetch-object: make functions return an error code
t0410: remove pipes after git commands
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 c22161f..0e5724f 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_CACHE_TREE #define DEBUG_CACHE_TREE 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))) { |