From 1065102dc7fb6c015575bba9772905c60627818f Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 6 Jun 2019 18:04:23 -0700
Subject: [PATCH 1/2] Update git2 crates for libgit2 0.28

See https://github.com/rust-lang/git2-rs/pull/425
---
 Cargo.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 095f1ddd2af..dc7eedc711c 100644
--- 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"

From c35c90028e5d6926ad7cbe0fdcdda286853b0307 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 7 Jun 2019 10:24:15 -0700
Subject: [PATCH 2/2] Make git auth script Windows/bash compatible

---
 tests/testsuite/build_auth.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/testsuite/build_auth.rs b/tests/testsuite/build_auth.rs
index 577eac18d22..02c710e6763 100644
--- 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()