From: Junio C Hamano Date: Fri, 5 Jun 2015 19:00:08 +0000 (-0700) Subject: Merge branch 'mh/clone-verbosity-fix' into maint X-Git-Tag: v2.4.3~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3821a1ae5580ac9788d866c292376070d3e5133?ds=inline;hp=-c Merge branch 'mh/clone-verbosity-fix' into maint 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 --- a3821a1ae5580ac9788d866c292376070d3e5133 diff --combined builtin/clone.c index 53a2e5af35,f6a60b9d17..13030ee1d1 --- a/builtin/clone.c +++ b/builtin/clone.c @@@ -34,7 -34,7 +34,7 @@@ * */ static const char * const builtin_clone_usage[] = { - N_("git clone [options] [--] []"), + N_("git clone [] [--] []"), NULL }; @@@ -842,21 -842,20 +842,21 @@@ int cmd_clone(int argc, const char **ar git_dir = mkpathdup("%s/.git", dir); } + atexit(remove_junk); + sigchain_push_common(remove_junk_on_signal); + if (!option_bare) { - junk_work_tree = work_tree; if (safe_create_leading_directories_const(work_tree) < 0) die_errno(_("could not create leading directories of '%s'"), work_tree); if (!dest_exists && mkdir(work_tree, 0777)) - die_errno(_("could not create work tree dir '%s'."), + die_errno(_("could not create work tree dir '%s'"), work_tree); + junk_work_tree = work_tree; set_git_work_tree(work_tree); } - junk_git_dir = git_dir; - atexit(remove_junk); - sigchain_push_common(remove_junk_on_signal); + junk_git_dir = git_dir; if (safe_create_leading_directories_const(git_dir) < 0) die(_("could not create leading directories of '%s'"), git_dir); @@@ -906,6 -905,8 +906,8 @@@ 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 -933,6 +934,6 @@@ 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);