From c19f173199b6beebf078a9e5c54014dbef85aa82 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Tue, 6 May 2025 13:51:26 +0100 Subject: chore: update git2 ~> v0.20.2 we have had some bugs related to git2 so moving to the latest version --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- src/lib/git/mod.rs | 4 ++-- test_utils/Cargo.toml | 2 +- tests/ngit_send.rs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e547cb6..15917b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1159,9 +1159,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git2" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" +checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" dependencies = [ "bitflags 2.9.0", "libc", @@ -1671,9 +1671,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libgit2-sys" -version = "0.17.0+1.8.1" +version = "0.18.1+1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" +checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 57cfb88..8814764 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ console = "0.15.7" dialoguer = "0.10.4" directories = "5.0.1" futures = "0.3.28" -git2 = "0.19.0" +git2 = "0.20.2" indicatif = "0.17.7" keyring = "2.0.5" nostr = { version = "0.40.0", features = ["nip05", "nip49"] } diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs index 1329820..0256457 100644 --- a/src/lib/git/mod.rs +++ b/src/lib/git/mod.rs @@ -1271,7 +1271,7 @@ mod tests { +some content1\n\\ \ No newline at end of file\n\ --\n\ - libgit2 1.8.1\n\ + libgit2 1.9.0\n\ \n\ ", git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?, @@ -1307,7 +1307,7 @@ mod tests { +some content1\n\\ \ No newline at end of file\n\ --\n\ - libgit2 1.8.1\n\ + libgit2 1.9.0\n\ \n\ ", git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &Some((3, 5)))?, diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 951bd39..cb945ca 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -9,7 +9,7 @@ assert_cmd = "2.0.12" dialoguer = "0.10.4" directories = "5.0.1" futures = "0.3.28" -git2 = "0.19.0" +git2 = "0.20.2" nostr = "0.40.0" nostr-database = "0.40.0" nostr-lmdb = "0.40.0" diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs index d7307fd..629454b 100644 --- a/tests/ngit_send.rs +++ b/tests/ngit_send.rs @@ -321,7 +321,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ +some content\n\\ \ No newline at end of file\n\ --\n\ - libgit2 1.8.1\n\ + libgit2 1.9.0\n\ \n\ ", ); @@ -347,7 +347,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_ +some content\n\\ \ No newline at end of file\n\ --\n\ - libgit2 1.8.1\n\ + libgit2 1.9.0\n\ \n\ ", ); -- cgit v1.2.3