Auto merge of #42246 - alexcrichton:update-cargo, r=nikomatsakis

Updated locked version of libgit2 This should include a fix for rust-lang/cargo#4091 with an updated version of libgit2. Closes rust-lang/cargo#4091
rust-lang · May 29, 2017 · 9111927 · 9111927
2 parents 920c479 + 3146d9f
commit 9111927
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/cargo b/src/tools/cargo
+118 −117		Cargo.lock
+1 −1		Cargo.toml
+5 −5		src/bin/bench.rs
+6 −5		src/bin/build.rs
+5 −5		src/bin/check.rs
+5 −5		src/bin/test.rs
+9 −2		src/cargo/core/shell.rs
+22 −0		src/cargo/ops/cargo_compile.rs
+1 −1		src/cargo/ops/cargo_new.rs
+1 −0		src/cargo/ops/cargo_run.rs
+8 −1		src/cargo/ops/cargo_rustc/custom_build.rs
+1 −1		src/cargo/util/flock.rs
+3 −45		src/cargo/util/toml.rs
+3 −0		src/doc/build-script.md
+53 −0		tests/bench.rs
+1 −1		tests/build-auth.rs
+44 −1		tests/build.rs
+6 −6		tests/cargo_alias_config.rs
+44 −0		tests/test.rs