From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 8 Mar 2018 19:06:02 +0000 (+0300)
Subject: Restore global initialization
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~47^2~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a8aea47f0e5a6e3947921b1c003ce8f834c230da;p=cargo.git

Restore global initialization
---

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) => {
     }