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 /builtin/cat-file.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 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 0f092382e1..85ae10bf0b 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -15,6 +15,7 @@ #include "sha1-array.h" #include "packfile.h" #include "object-store.h" +#include "promisor-remote.h" struct batch_options { int enabled; @@ -523,8 +524,8 @@ static int batch_objects(struct batch_options *opt) if (opt->all_objects) { struct object_cb_data cb; - if (repository_format_partial_clone) - warning("This repository has extensions.partialClone set. Some objects may not be loaded."); + if (has_promisor_remote()) + warning("This repository uses promisor remotes. Some objects may not be loaded."); cb.opt = opt; cb.expand = &data; |