From a8aea47f0e5a6e3947921b1c003ce8f834c230da Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 8 Mar 2018 22:06:02 +0300 Subject: [PATCH] Restore global initialization --- src/bin/cargo.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs index 9d01f9c3c..716fddec2 100644 --- a/src/bin/cargo.rs +++ b/src/bin/cargo.rs @@ -88,13 +88,18 @@ fn main() { } }; - let result = cli::do_main(&mut config); - match result { + match main_inner(&mut config) { Err(e) => cargo::exit_with_error(e, &mut *config.shell()), Ok(()) => {} } } +fn main_inner(config: &mut Config) -> CliResult { + init_git_transports(config); + let _token = cargo::util::job::setup(); + cli::do_main(config) +} + macro_rules! each_subcommand{ ($mac:ident) => { } -- 2.30.2