зеркало из https://github.com/microsoft/git.git
transport-helper: ask the helper to set the same options for import as for fetch
A remote helper is currently only told about the 'check-connectivity', 'cloning', and 'update-shallow' options when it supports the 'fetch' command, but not when it supports 'import' instead. This is especially important for the 'cloning' option, because it means a remote helper that only supports 'import' can't distinguish between a clone and a pull besides doing some assumptions from the git directory state. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
2879bc3b0c
Коммит
aab1beb0e1
|
@ -342,16 +342,6 @@ static int fetch_with_fetch(struct transport *transport,
|
|||
int i;
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
if (data->check_connectivity &&
|
||||
data->transport_options.check_self_contained_and_connected)
|
||||
set_helper_option(transport, "check-connectivity", "true");
|
||||
|
||||
if (transport->cloning)
|
||||
set_helper_option(transport, "cloning", "true");
|
||||
|
||||
if (data->transport_options.update_shallow)
|
||||
set_helper_option(transport, "update-shallow", "true");
|
||||
|
||||
for (i = 0; i < nr_heads; i++) {
|
||||
const struct ref *posn = to_fetch[i];
|
||||
if (posn->status & REF_STATUS_UPTODATE)
|
||||
|
@ -622,6 +612,16 @@ static int fetch(struct transport *transport,
|
|||
if (!count)
|
||||
return 0;
|
||||
|
||||
if (data->check_connectivity &&
|
||||
data->transport_options.check_self_contained_and_connected)
|
||||
set_helper_option(transport, "check-connectivity", "true");
|
||||
|
||||
if (transport->cloning)
|
||||
set_helper_option(transport, "cloning", "true");
|
||||
|
||||
if (data->transport_options.update_shallow)
|
||||
set_helper_option(transport, "update-shallow", "true");
|
||||
|
||||
if (data->fetch)
|
||||
return fetch_with_fetch(transport, nr_heads, to_fetch);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче