diff --git a/Cargo.lock b/Cargo.lock index 585a6e904b..c3086df73e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -479,7 +479,7 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "libgit2-sys" -version = "0.18.4+1.9.3" +version = "0.18.5+1.9.4" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 7df32eacfa..6d71da6e88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ url = { version = "2.5.4", optional = true } bitflags = "2.1.0" libc = "0.2" log = "0.4.8" -libgit2-sys = { path = "libgit2-sys", version = "0.18.4" } +libgit2-sys = { path = "libgit2-sys", version = "0.18.5" } [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies] openssl-sys = { version = "0.9.45", optional = true } diff --git a/libgit2-sys/CHANGELOG.md b/libgit2-sys/CHANGELOG.md index ea309fc5b9..9a82f1b799 100644 --- a/libgit2-sys/CHANGELOG.md +++ b/libgit2-sys/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.18.5+1.9.4 - 2026-05-23 +[0.18.4...0.18.5](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.18.4+1.9.3...libgit2-sys-0.18.5+1.9.4) + +### Changed +- Updated to libgit2 [1.9.4](https://github.com/libgit2/libgit2/releases/tag/v1.9.4) + [#1260](https://github.com/rust-lang/git2-rs/pull/1260) + ## 0.18.4+1.9.3 - 2026-05-07 [0.18.3...0.18.4](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.18.3+1.9.2...libgit2-sys-0.18.4+1.9.3) diff --git a/libgit2-sys/Cargo.toml b/libgit2-sys/Cargo.toml index fef7805729..7dec66f2d4 100644 --- a/libgit2-sys/Cargo.toml +++ b/libgit2-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libgit2-sys" -version = "0.18.4+1.9.3" +version = "0.18.5+1.9.4" authors = ["Josh Triplett ", "Alex Crichton "] links = "git2" build = "build.rs" diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs index b45118c9b5..8407f114b7 100644 --- a/libgit2-sys/build.rs +++ b/libgit2-sys/build.rs @@ -9,7 +9,7 @@ fn try_system_libgit2( experimental_sha256: bool, ) -> Result> { let mut cfg = pkg_config::Config::new(); - let range_version = "1.9.3".."1.10.0"; + let range_version = "1.9.4".."1.10.0"; let lib = if experimental_sha256 { // Determine whether experimental SHA256 object support is enabled. diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2 index 1affb8b193..f7164261c9 160000 --- a/libgit2-sys/libgit2 +++ b/libgit2-sys/libgit2 @@ -1 +1 @@ -Subproject commit 1affb8b19346c4f90e163a9a0364959ff1410f64 +Subproject commit f7164261c9bc0a7e0ebf767c584e5192810a8b24 diff --git a/tests/add_extensions.rs b/tests/add_extensions.rs index 3cafa60eef..bf14a25cd7 100644 --- a/tests/add_extensions.rs +++ b/tests/add_extensions.rs @@ -22,6 +22,8 @@ fn test_add_extensions() -> Result<(), Error> { Some("objectformat"), // The preciousobjects extension was added in 1.9 Some("preciousobjects"), + // The relativeworktrees extension was added in 1.9.4 + Some("relativeworktrees"), // The worktreeconfig extension was added in 1.8 Some("worktreeconfig") ] diff --git a/tests/get_extensions.rs b/tests/get_extensions.rs index db8e456a85..731d98781a 100644 --- a/tests/get_extensions.rs +++ b/tests/get_extensions.rs @@ -17,6 +17,8 @@ fn test_get_extensions() -> Result<(), Error> { Some("objectformat"), // The preciousobjects extension was added in 1.9 Some("preciousobjects"), + // The relativeworktrees extension was added in 1.9.4 + Some("relativeworktrees"), // The worktreeconfig extension was added in 1.8 Some("worktreeconfig") ] diff --git a/tests/remove_extensions.rs b/tests/remove_extensions.rs index 5a3e21d170..422cdf6a3c 100644 --- a/tests/remove_extensions.rs +++ b/tests/remove_extensions.rs @@ -12,6 +12,7 @@ fn test_remove_extensions() -> Result<(), Error> { "!noop", "!objectformat", "!preciousobjects", + "!relativeworktrees", "!worktreeconfig", "other", ])?;