upleb.uk

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

summaryrefslogtreecommitdiff
path: root/src/lib/git
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 /src/lib/git
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.
Diffstat (limited to 'src/lib/git')
-rw-r--r--src/lib/git/mod.rs4
1 files changed, 2 insertions, 2 deletions
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)))?,