[PATCH] clone: call transport_set_verbosity before anything else on the newly created transport
- From
Mike Hommey <mh@glandium.org>
- Date
- May 12, 2015, 03:12 UTC
- Message-ID
- <1431400351-1590-1-git-send-email-mh@glandium.org>
- In-Reply-To
- <xmqqfv721rh7.fsf@gitster.dls.corp.google.com>
Commit 2879bc3 made the progress and verbosity options sent to remote helper earlier than they previously were. But nothing else after that would send updates if the value is changed later on with transport_set_verbosity.
While for fetch and push, transport_set_verbosity is the first thing that is done after creating the transport, it was not the case for clone. So commit 2879bc3 broke changing progress and verbosity for clone, for urls requiring a remote helper only (so, not git:// urls, for instance).
Moving transport_set_verbosity to just after the transport is created works around the issue. --- builtin/clone.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Note that another long term way to fix this would be to move setting verbosity and progress to the transport_get call itself.
The patch is against v2.4.0, if that matters.
diff --git a/builtin/clone.c b/builtin/clone.c index 53a2e5a..13030ee 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -906,6 +906,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) remote = remote_get(option_origin); transport = transport_get(remote, remote->url[0]); + transport_set_verbosity(transport, option_verbosity, option_progress); + path = get_repo_path(remote->url[0], &is_bundle); is_local = option_local != 0 && path && !is_bundle; if (is_local) { @@ -932,8 +934,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_single_branch) transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1"); - transport_set_verbosity(transport, option_verbosity, option_progress); - if (option_upload_pack) transport_set_option(transport, TRANS_OPT_UPLOADPACK, option_upload_pack);
-- 2.4.0.1.gde5e018