Skip to content

Commit

Permalink
Merge branch 'mh/clone-verbosity-fix' into maint
Browse files Browse the repository at this point in the history
Git 2.4 broke setting verbosity and progress levels on "git clone"
with native transports.

* mh/clone-verbosity-fix:
  clone: call transport_set_verbosity before anything else on the newly created transport
  • Loading branch information
Junio C Hamano committed Jun 5, 2015
2 parents 3c91e99 + 822f0c4 commit a3821a1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down

0 comments on commit a3821a1

Please sign in to comment.