Skip to content

Commit e30ab5e

Browse files
committed
Auto merge of #7018 - cuviper:libgit2-0.28, r=alexcrichton
Update git2 crates for libgit2 0.28 See rust-lang/git2-rs#425
2 parents 9ef364a + c35c900 commit e30ab5e

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ failure = "0.1.5"
3232
filetime = "0.2"
3333
flate2 = { version = "1.0.3", features = ['zlib'] }
3434
fs2 = "0.4"
35-
git2 = "0.8.0"
36-
git2-curl = "0.9.0"
35+
git2 = "0.9.0"
36+
git2-curl = "0.10.0"
3737
glob = "0.3.0"
3838
hex = "0.3"
3939
home = "0.3"
@@ -43,7 +43,7 @@ jobserver = "0.1.13"
4343
lazycell = "1.2.0"
4444
libc = "0.2"
4545
log = "0.4.6"
46-
libgit2-sys = "0.7.9"
46+
libgit2-sys = "0.8.0"
4747
memchr = "2.1.3"
4848
num_cpus = "1.0"
4949
opener = "0.4"

tests/testsuite/build_auth.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ fn http_auth_offered() {
9191
let config = paths::home().join(".gitconfig");
9292
let mut config = git2::Config::open(&config).unwrap();
9393
config
94-
.set_str("credential.helper", &script.display().to_string())
94+
.set_str(
95+
"credential.helper",
96+
// This is a bash script so replace `\` with `/` for Windows
97+
&script.display().to_string().replace("\\", "/"),
98+
)
9599
.unwrap();
96100

97101
let p = project()

0 commit comments

Comments
 (0)