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>2026-02-25 12:27:56 +0000
committerDanConwayDev <DanConwayDev@protonmail.com>2026-02-25 12:27:56 +0000
commitca2df272594a7b055c740ccda0b9c31b3b7e43cc (patch)
treef66ddfd7f72501e1eed63839cfe14ef2ccf71dbf
parentfb5a3ccceeba5418e9267a442efd95acb1da8f0e (diff)
fix: update hardcoded libgit2 version strings in tests to 1.9.2
The Nix environment provides libgit2 1.9.2 via nixpkgs, which libgit2-sys picks up at build time instead of using its bundled version. This caused test assertions that hardcode the libgit2 version string (appended by libgit2 to patch output) to fail after commit 319bb7f added new Cargo dependencies, though the exact mechanism by which those dependencies triggered the switch from the bundled 1.9.1 to the system 1.9.2 remains unclear. Also bump git2 from 0.20.2 to 0.20.4 in both Cargo.toml files so the bundled libgit2-sys version (0.18.3+1.9.2) properly aligns with the 1.9.2 version in use.
-rw-r--r--Cargo.toml4
-rw-r--r--src/lib/git/mod.rs4
-rw-r--r--src/lib/mbox_parser.rs4
-rw-r--r--test_utils/Cargo.toml2
-rw-r--r--tests/ngit_send.rs4
5 files changed, 9 insertions, 9 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 721893e..4c42d0d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
1[package] 1[package]
2name = "ngit" 2name = "ngit"
3version = "2.2.0" 3version = "2.2.1"
4edition = "2021" 4edition = "2021"
5description = "nostr plugin for git" 5description = "nostr plugin for git"
6authors = ["DanConwayDev <DanConwayDev@protonmail.com>"] 6authors = ["DanConwayDev <DanConwayDev@protonmail.com>"]
@@ -23,7 +23,7 @@ console = "0.16.0"
23dialoguer = "0.12.0" 23dialoguer = "0.12.0"
24directories = "6.0.0" 24directories = "6.0.0"
25futures = "0.3.31" 25futures = "0.3.31"
26git2 = "0.20.2" 26git2 = "0.20.4"
27indicatif = "0.18.0" 27indicatif = "0.18.0"
28mailparse = "0.16.1" 28mailparse = "0.16.1"
29nostr = { version = "0.44.1", features = ["nip49"] } 29nostr = { version = "0.44.1", features = ["nip49"] }
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index dc84ee3..23fa5f0 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -1477,7 +1477,7 @@ mod tests {
1477 +some content1\n\\ \ 1477 +some content1\n\\ \
1478 No newline at end of file\n\ 1478 No newline at end of file\n\
1479 --\n\ 1479 --\n\
1480 libgit2 1.9.1\n\ 1480 libgit2 1.9.2\n\
1481 \n\ 1481 \n\
1482 ", 1482 ",
1483 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?, 1483 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &None)?,
@@ -1513,7 +1513,7 @@ mod tests {
1513 +some content1\n\\ \ 1513 +some content1\n\\ \
1514 No newline at end of file\n\ 1514 No newline at end of file\n\
1515 --\n\ 1515 --\n\
1516 libgit2 1.9.1\n\ 1516 libgit2 1.9.2\n\
1517 \n\ 1517 \n\
1518 ", 1518 ",
1519 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &Some((3, 5)))?, 1519 git_repo.make_patch_from_commit(&oid_to_sha1(&oid), &Some((3, 5)))?,
diff --git a/src/lib/mbox_parser.rs b/src/lib/mbox_parser.rs
index 48190ba..f3815f9 100644
--- a/src/lib/mbox_parser.rs
+++ b/src/lib/mbox_parser.rs
@@ -333,7 +333,7 @@ index 0000000..a66525d
333+some content1 333+some content1
334\\ No newline at end of file 334\\ No newline at end of file
335-- 335--
336libgit2 1.9.1 336libgit2 1.9.2
337 337
338" 338"
339 .to_string() 339 .to_string()
@@ -531,7 +531,7 @@ Subject: [PATCH] test
531 531
532This is the body. 532This is the body.
533-- 533--
534libgit2 1.9.1 534libgit2 1.9.2
535 535
536diff --git a/file.txt b/file.txt 536diff --git a/file.txt b/file.txt
537"; 537";
diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml
index e7f5e05..68eba20 100644
--- a/test_utils/Cargo.toml
+++ b/test_utils/Cargo.toml
@@ -9,7 +9,7 @@ assert_cmd = "2.0.17"
9dialoguer = "0.12.0" 9dialoguer = "0.12.0"
10directories = "6.0.0" 10directories = "6.0.0"
11futures = "0.3.31" 11futures = "0.3.31"
12git2 = "0.20.2" 12git2 = "0.20.4"
13nostr = "0.44.1" 13nostr = "0.44.1"
14nostr-database = "0.44.0" 14nostr-database = "0.44.0"
15nostr-lmdb = "0.44.0" 15nostr-lmdb = "0.44.0"
diff --git a/tests/ngit_send.rs b/tests/ngit_send.rs
index 67b2209..9e66051 100644
--- a/tests/ngit_send.rs
+++ b/tests/ngit_send.rs
@@ -421,7 +421,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
421 +some content\n\\ \ 421 +some content\n\\ \
422 No newline at end of file\n\ 422 No newline at end of file\n\
423 --\n\ 423 --\n\
424 libgit2 1.9.1\n\ 424 libgit2 1.9.2\n\
425 \n\ 425 \n\
426 ", 426 ",
427 ); 427 );
@@ -447,7 +447,7 @@ mod when_cover_letter_details_specified_with_range_of_head_2_sends_cover_letter_
447 +some content\n\\ \ 447 +some content\n\\ \
448 No newline at end of file\n\ 448 No newline at end of file\n\
449 --\n\ 449 --\n\
450 libgit2 1.9.1\n\ 450 libgit2 1.9.2\n\
451 \n\ 451 \n\
452 ", 452 ",
453 ); 453 );