upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2025-05-06 13:51:26 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2025-05-06 14:00:29 +0100
commitc19f173199b6beebf078a9e5c54014dbef85aa82 (patch)
treeb3f233b3116748c2a5de398cffa3a1de7c7473ad
parent1c4e5ff8c8addc20862d59606c7daf900bd69c67 (diff)
chore: update git2 ~> v0.20.2
we have had some bugs related to git2 so moving to the latest version
-rw-r--r--Cargo.lock8
-rw-r--r--Cargo.toml2
-rw-r--r--src/lib/git/mod.rs4
-rw-r--r--test_utils/Cargo.toml2
-rw-r--r--tests/ngit_send.rs4
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"
1159 1159
1160[[package]] 1160[[package]]
1161name = "git2" 1161name = "git2"
1162version = "0.19.0" 1162version = "0.20.2"
1163source = "registry+https://github.com/rust-lang/crates.io-index" 1163source = "registry+https://github.com/rust-lang/crates.io-index"
1164checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" 1164checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110"
1165dependencies = [ 1165dependencies = [
1166 "bitflags 2.9.0", 1166 "bitflags 2.9.0",
1167 "libc", 1167 "libc",
@@ -1671,9 +1671,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
1671 1671
1672[[package]] 1672[[package]]
1673name = "libgit2-sys" 1673name = "libgit2-sys"
1674version = "0.17.0+1.8.1" 1674version = "0.18.1+1.9.0"
1675source = "registry+https://github.com/rust-lang/crates.io-index" 1675source = "registry+https://github.com/rust-lang/crates.io-index"
1676checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" 1676checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
1677dependencies = [ 1677dependencies = [
1678 "cc", 1678 "cc",
1679 "libc", 1679 "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"
21dialoguer = "0.10.4" 21dialoguer = "0.10.4"
22directories = "5.0.1" 22directories = "5.0.1"
23futures = "0.3.28" 23futures = "0.3.28"
24git2 = "0.19.0" 24git2 = "0.20.2"
25indicatif = "0.17.7" 25indicatif = "0.17.7"
26keyring = "2.0.5" 26keyring = "2.0.5"
27nostr = { version = "0.40.0", features = ["nip05", "nip49"] } 27nostr = { 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 {
1271 +some content1\n\\ \ 1271 +some content1\n\\ \
1272 No newline at end of file\n\ 1272 No newline at end of file\n\
1273 --\n\ 1273 --\n\
1274 libgit2 1.8.1\n\ 1274 libgit2 1.9.0\n\
1275 \n\ 1275 \n\
1276 ", 1276 ",
1277 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?, 1277 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?,
@@ -1307,7 +1307,7 @@ mod tests {
1307 +some content1\n\\ \ 1307 +some content1\n\\ \
1308 No newline at end of file\n\ 1308 No newline at end of file\n\
1309 --\n\ 1309 --\n\
1310 libgit2 1.8.1\n\ 1310 libgit2 1.9.0\n\
1311 \n\ 1311 \n\
1312 ", 1312 ",
1313 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &Some((3, 5)))?, 1313 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"
9dialoguer = "0.10.4" 9dialoguer = "0.10.4"
10directories = "5.0.1" 10directories = "5.0.1"
11futures = "0.3.28" 11futures = "0.3.28"
12git2 = "0.19.0" 12git2 = "0.20.2"
13nostr = "0.40.0" 13nostr = "0.40.0"
14nostr-database = "0.40.0" 14nostr-database = "0.40.0"
15nostr-lmdb = "0.40.0" 15nostr-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_
321 +some content\n\\ \ 321 +some content\n\\ \
322 No newline at end of file\n\ 322 No newline at end of file\n\
323 --\n\ 323 --\n\
324 libgit2 1.8.1\n\ 324 libgit2 1.9.0\n\
325 \n\ 325 \n\
326 ", 326 ",
327 ); 327 );
@@ -347,7 +347,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
347 +some content\n\\ \ 347 +some content\n\\ \
348 No newline at end of file\n\ 348 No newline at end of file\n\
349 --\n\ 349 --\n\
350 libgit2 1.8.1\n\ 350 libgit2 1.9.0\n\
351 \n\ 351 \n\
352 ", 352 ",
353 ); 353 );