Skip to content

Commit

Permalink
Auto merge of rust-lang#10557 - Mrmaxmeier:backport-libgit2-update, r…
Browse files Browse the repository at this point in the history
…=ehuss

Backport git2 update rust-lang#10442 as 0.61.1

This is a version bump and backport of the git2 updates in rust-lang#10442 to the `rust-1.60.0` branch.

Closes rust-lang#10446
  • Loading branch information
bors committed Apr 13, 2022
2 parents d1fd9fe + 14ae7c5 commit 2ff0b40
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo"
version = "0.61.0"
version = "0.61.1"
edition = "2021"
license = "MIT OR Apache-2.0"
homepage = "https://crates.io"
Expand Down Expand Up @@ -29,8 +29,8 @@ pretty_env_logger = { version = "0.4", optional = true }
anyhow = "1.0"
filetime = "0.2.9"
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
git2 = "0.13.23"
git2-curl = "0.14.1"
git2 = "0.14.2"
git2-curl = "0.15.0"
glob = "0.3.0"
hex = "0.4"
home = "0.5"
Expand All @@ -41,7 +41,7 @@ jobserver = "0.1.24"
lazycell = "1.2.0"
libc = "0.2"
log = "0.4.6"
libgit2-sys = "0.12.24"
libgit2-sys = "0.13.2"
memchr = "2.1.3"
num_cpus = "1.0"
opener = "0.5"
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-test-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cargo-test-macro = { path = "../cargo-test-macro" }
cargo-util = { path = "../cargo-util" }
filetime = "0.2"
flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
git2 = "0.13.16"
git2 = "0.14.2"
glob = "0.3"
itertools = "0.10.0"
lazy_static = "1.0"
Expand Down

0 comments on commit 2ff0b40

Please sign in to comment.