Auto merge of #7018 - cuviper:libgit2-0.28, r=alexcrichton

Update git2 crates for libgit2 0.28 See rust-lang/git2-rs#425
rust-lang · Jun 7, 2019 · e30ab5e · e30ab5e
2 parents 9ef364a + c35c900
commit e30ab5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,8 +32,8 @@ failure = "0.1.5"
 filetime = "0.2"
 flate2 = { version = "1.0.3", features = ['zlib'] }
 fs2 = "0.4"
-git2 = "0.8.0"
-git2-curl = "0.9.0"
+git2 = "0.9.0"
+git2-curl = "0.10.0"
 glob = "0.3.0"
 hex = "0.3"
 home = "0.3"
@@ -43,7 +43,7 @@ jobserver = "0.1.13"
 lazycell = "1.2.0"
 libc = "0.2"
 log = "0.4.6"
-libgit2-sys = "0.7.9"
+libgit2-sys = "0.8.0"
 memchr = "2.1.3"
 num_cpus = "1.0"
 opener = "0.4"

diff --git a/tests/testsuite/build_auth.rs b/tests/testsuite/build_auth.rs
@@ -91,7 +91,11 @@ fn http_auth_offered() {
     let config = paths::home().join(".gitconfig");
     let mut config = git2::Config::open(&config).unwrap();
     config
-        .set_str("credential.helper", &script.display().to_string())
+        .set_str(
+            "credential.helper",
+            // This is a bash script so replace `\` with `/` for Windows
+            &script.display().to_string().replace("\\", "/"),
+        )
         .unwrap();
 
     let p = project()