development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-28 11:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump git2 dependencies

Browse source
This commit is contained in:
Matthias Krüger 2019-12-13 12:40:31 +01:00
parent d5e20a9b7f
commit 8245e02924
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.toml
View file

@ -33,8 +33,8 @@ failure = "0.1.5"
filetime = "0.2"
flate2 = { version = "1.0.3", features = ["zlib"] }
fs2 = "0.4"
git2 = "0.10.0"
git2-curl = "0.11.0"
git2 = "0.11.0"
git2-curl = "0.12.0"
glob = "0.3.0"
hex = "0.4"
home = "0.5"
@ -45,7 +45,7 @@ jobserver = "0.1.13"
lazycell = "1.2.0"
libc = "0.2"
log = "0.4.6"
libgit2-sys = "0.9.0"
libgit2-sys = "0.10.0"
memchr = "2.1.3"
num_cpus = "1.0"
opener = "0.4"

2
crates/cargo-test-support/Cargo.toml
View file

@ -12,7 +12,7 @@ cargo = { path = "../.." }
cargo-test-macro = { path = "../cargo-test-macro" }
filetime = "0.2"
flate2 = "1.0"
git2 = "0.10"
git2 = "0.11"
glob = "0.3"
lazy_static = "1.0"
remove_dir_all = "0.5"

2
crates/cargo-test-support/src/git.rs
View file

@ -197,7 +197,7 @@ pub fn add_submodule<'a>(
default_repo_cfg(&subrepo);
t!(subrepo.remote_add_fetch("origin", "refs/heads/*:refs/heads/*"));
let mut origin = t!(subrepo.find_remote("origin"));
t!(origin.fetch(&[], None, None));
t!(origin.fetch(&Vec::<String>::new(), None, None));
t!(subrepo.checkout_head(None));
t!(s.add_finalize());
s

2
tests/testsuite/git.rs
View file

@ -1201,7 +1201,7 @@ fn dep_with_changed_submodule() {
.remote_set_url("origin", &git_project3.url().to_string())
.unwrap();
let mut origin = subrepo.find_remote("origin").unwrap();
origin.fetch(&[], None, None).unwrap();
origin.fetch(&Vec::<String>::new(), None, None).unwrap();
let id = subrepo.refname_to_id("refs/remotes/origin/master").unwrap();
let obj = subrepo.find_object(id, None).unwrap();
subrepo.reset(&obj, git2::ResetType::Hard, None).unwrap();