Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/git2-rs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.17.0
Choose a base ref
...
head repository: rust-lang/git2-rs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.17.1
Choose a head ref
  • 6 commits
  • 8 files changed
  • 2 contributors

Commits on Apr 10, 2023

  1. Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    Copy the full SHA
    16e5696 View commit details
  2. Merge pull request #947 from ehuss/readme-libgit2-version

    Update reference to libgit2 version in README.
    ehuss authored Apr 10, 2023
    Copy the full SHA
    c6a3ddc View commit details

Commits on Apr 13, 2023

  1. Bump libgit2 to 1.6.4

    edrevo committed Apr 13, 2023
    Copy the full SHA
    3bd681c View commit details
  2. Copy the full SHA
    55d0e67 View commit details

Commits on Apr 16, 2023

  1. Update 1.6.4 changelog entry.

    The previous looked to be a copy/paste from the previous one.
    ehuss authored Apr 16, 2023
    Copy the full SHA
    8656d0e View commit details
  2. Merge pull request #948 from edrevo/edrevo/libgit2-1.6.4

    Bump libgit2 to 1.6.4
    ehuss authored Apr 16, 2023
    Copy the full SHA
    88c67f7 View commit details
Showing with 28 additions and 9 deletions.
  1. +8 −0 CHANGELOG.md
  2. +1 −0 CONTRIBUTING.md
  3. +2 −2 Cargo.toml
  4. +5 −4 README.md
  5. +9 −0 libgit2-sys/CHANGELOG.md
  6. +1 −1 libgit2-sys/Cargo.toml
  7. +1 −1 libgit2-sys/build.rs
  8. +1 −1 libgit2-sys/libgit2
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.17.1 - 2023-04-13
[0.17.0...0.17.1](https://github.com/rust-lang/git2-rs/compare/0.17.0...0.17.1)

### Changed

- Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4).
[#948](https://github.com/rust-lang/git2-rs/pull/948)

## 0.17.0 - 2023-04-02
[0.16.1...0.17.0](https://github.com/rust-lang/git2-rs/compare/0.16.1...0.17.0)

1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ The following steps can be used to update libgit2:
* Update the dependency version in [`Cargo.toml`](https://github.com/rust-lang/git2-rs/blob/master/Cargo.toml) to match the version in the last step (do not include the `+` metadata).
Also update the version of the `git2` crate itself so it will pick up the change to `libgit2-sys` (also keeping in mind if it is a SemVer breaking release).
* Update the version in [`README.md`](https://github.com/rust-lang/git2-rs/blob/master/README.md) if needed.
There are two places, the `Cargo.toml` example and the description of the libgit2 version it binds with.
* If there was a SemVer-breaking version bump for either library, also update the `html_root_url` attribute in the `lib.rs` of each library.
3. Run tests.
`cargo test -p git2 -p git2-curl` is a good starting point.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git2"
version = "0.17.0"
version = "0.17.1"
authors = ["Josh Triplett <josh@joshtriplett.org>", "Alex Crichton <alex@alexcrichton.com>"]
license = "MIT OR Apache-2.0"
readme = "README.md"
@@ -20,7 +20,7 @@ url = "2.0"
bitflags = "1.1.0"
libc = "0.2"
log = "0.4.8"
libgit2-sys = { path = "libgit2-sys", version = "0.15.0" }
libgit2-sys = { path = "libgit2-sys", version = "0.15.1" }

[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
openssl-sys = { version = "0.9.0", optional = true }
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ libgit2 bindings for Rust.

```toml
[dependencies]
git2 = "0.17.0"
git2 = "0.17.1"
```

## Rust version requirements
@@ -16,9 +16,10 @@ stable release as well.

## Version of libgit2

Currently this library requires libgit2 1.4. The source for libgit2 is
included in the libgit2-sys crate so there's no need to pre-install the libgit2
library, the libgit2-sys crate will figure that and/or build that for you.
Currently this library requires libgit2 1.6.4 (or newer patch versions). The
source for libgit2 is included in the libgit2-sys crate so there's no need to
pre-install the libgit2 library, the libgit2-sys crate will figure that and/or
build that for you.

## Building git2-rs

9 changes: 9 additions & 0 deletions libgit2-sys/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 0.15.1+1.6.4 - 2023-04-13
[0.15.0...0.15.1](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.15.0+1.6.3...libgit2-sys-0.15.1+1.6.4)

### Changed

- Updated to libgit2 [1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4).
This brings in a minor fix on Windows when the ProgramData directory does not exist.
[#948](https://github.com/rust-lang/git2-rs/pull/948)

## 0.15.0+1.6.3 - 2023-04-02
[0.14.2...0.15.0](https://github.com/rust-lang/git2-rs/compare/libgit2-sys-0.14.2+1.5.1...libgit2-sys-0.15.0+1.6.3)

2 changes: 1 addition & 1 deletion libgit2-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libgit2-sys"
version = "0.15.0+1.6.3"
version = "0.15.1+1.6.4"
authors = ["Josh Triplett <josh@joshtriplett.org>", "Alex Crichton <alex@alexcrichton.com>"]
links = "git2"
build = "build.rs"
2 changes: 1 addition & 1 deletion libgit2-sys/build.rs
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ fn main() {
let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat;
if try_to_use_system_libgit2 {
let mut cfg = pkg_config::Config::new();
if let Ok(lib) = cfg.range_version("1.6.3".."1.7.0").probe("libgit2") {
if let Ok(lib) = cfg.range_version("1.6.4".."1.7.0").probe("libgit2") {
for include in &lib.include_paths {
println!("cargo:root={}", include.display());
}
2 changes: 1 addition & 1 deletion libgit2-sys/libgit2