Bump versions of git2 and libgit2-sys

Author: ehuss

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## 0.20.1 - 2025-03-17
+[0.20.0...0.20.1](https://github.com/rust-lang/git2-rs/compare/git2-0.20.0...git2-0.20.1)
+
+### Added
+
+- Added `Repository::branch_upstream_merge()`
+  [#1131](https://github.com/rust-lang/git2-rs/pull/1131)
+- Added `Index::conflict_get()`
+  [#1134](https://github.com/rust-lang/git2-rs/pull/1134)
+- Added `Index::conflict_remove()`
+  [#1133](https://github.com/rust-lang/git2-rs/pull/1133)
+- Added `opts::set_cache_object_limit()`
+  [#1118](https://github.com/rust-lang/git2-rs/pull/1118)
+- Added `Repo::merge_file_from_index()` and associated `MergeFileOptions` and `MergeFileResult`.
+  [#1062](https://github.com/rust-lang/git2-rs/pull/1062)
+
+### Changed
+
+- The `url` dependency minimum raised to 2.5.4
+  [#1128](https://github.com/rust-lang/git2-rs/pull/1128)
+- Changed the tracing callback to abort the process if the callback panics instead of randomly detecting the panic in some other function.
+  [#1121](https://github.com/rust-lang/git2-rs/pull/1121)
+- Credential helper config (loaded with `CredentialHelper::config`) now checks for helpers that start with something that looks like an absolute path, rather than checking for a `/` or `\` anywhere in the helper string (which resolves an issue if the helper had arguments with `/` or `\`).
+  [#1137](https://github.com/rust-lang/git2-rs/pull/1137)
+
+### Fixed
+
+- Fixed panic in `Remote::url_bytes` if the url is empty.
+  [#1120](https://github.com/rust-lang/git2-rs/pull/1120)
+- Fixed incorrect lifetimes on `Patch::delta`, `Patch::hunk`, and `Patch::line_in_hunk`. The return values must not outlive the `Patch`.
+  [#1141](https://github.com/rust-lang/git2-rs/pull/1141)
+- Bumped requirement to libgit2-sys 0.18.1, which fixes linking of advapi32 on Windows.
+  [#1143](https://github.com/rust-lang/git2-rs/pull/1143)
+
+
 ## 0.20.0 - 2025-01-04
 [0.19.0...0.20.0](https://github.com/rust-lang/git2-rs/compare/git2-0.19.0...git2-0.20.0)
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "git2"
-version = "0.20.0"
+version = "0.20.1"
 authors = ["Josh Triplett <[email protected]>", "Alex Crichton <[email protected]>"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
@@ -20,7 +20,7 @@ url = "2.5.4"
 bitflags = "2.1.0"
 libc = "0.2"
 log = "0.4.8"
-libgit2-sys = { path = "libgit2-sys", version = "0.18.0" }
+libgit2-sys = { path = "libgit2-sys", version = "0.18.1" }
 
 [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
 openssl-sys = { version = "0.9.45", optional = true }

Cargo.toml

@@ -6,7 +6,7 @@ libgit2 bindings for Rust.
 
 ```toml
 [dependencies]
-git2 = "0.20.0"
+git2 = "0.20.1"
 ```
 
 ## Rust version requirements

README.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.18.1+1.9.0 - 2025-03-17
+[0.18.0...0.18.1](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.18.0+1.9.0...libgit2-sys-0.18.1+1.9.0)
+
+### Added
+
+- Added binding for `git_branch_upstream_merge`
+  [#1131](https://github.com/rust-lang/git2-rs/pull/1131)
+- Added bindings for `git_merge_file_options` and `git_merge_file_result`, `git_merge_file_options_init`, `git_merge_file_from_index`, `git_merge_file_result_free`, and updated `git_merge_file_flag_t`.
+  [#1062](https://github.com/rust-lang/git2-rs/pull/1062)
+
+### Fixed
+
+- Fixed linking to advapi32 on Windows for recent nightly versions of Rust.
+  [#1143](https://github.com/rust-lang/git2-rs/pull/1143)
+
 ## 0.18.0+1.9.0 - 2025-01-04
 [0.16.2...0.17.0](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.17.0+1.8.1...libgit2-sys-0.18.0+1.9.0)
 

libgit2-sys/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "libgit2-sys"
-version = "0.18.0+1.9.0"
+version = "0.18.1+1.9.0"
 authors = ["Josh Triplett <[email protected]>", "Alex Crichton <[email protected]>"]
 links = "git2"
 build = "build.rs"