fix: adjust custom err from cert-check due to libgit2 1.8 change - #13970
Merged
Conversation
rustbot
added
A-git
libgit2 disallows overriding errors from certificate check since v1.8.0, so we store the error additionally and unwrap it later. See libgit2/libgit2@9a9f220
Member
Author
|
This commit shows that the code change are compatible with both libgit2 1.7 and 1.8: aa2ad97. I believe this is good to merge now without waiting for a new git2-rs release. |
weihanglo
marked this pull request as ready for review
May 31, 2024 04:42
Contributor
|
Yea, it was a little precarious how the error was getting shuttled around. Thank you very much for looking into this and getting it fixed! @bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2024
Update cargo 9 commits in 431db31d0dbeda320caf8ef8535ea48eb3093407..7a6fad0984d28c8330974636972aa296b67c4513 2024-05-28 18:17:31 +0000 to 2024-05-31 22:26:03 +0000 - fix(config): Ensure `--config net.git-fetch-with-cli=true` is respected (rust-lang/cargo#13992) - Fix libcurl proxy documentation link (rust-lang/cargo#13990) - fix(new): Dont say were adding to a workspace when a regular package is in root (rust-lang/cargo#13987) - fix: adjust custom err from cert-check due to libgit2 1.8 change (rust-lang/cargo#13970) - fix(toml): Ensure targets are in a deterministic order (rust-lang/cargo#13989) - doc(cargo-package): explain no guarantee of vcs provenance (rust-lang/cargo#13984) - chore: fix some comments (rust-lang/cargo#13982) - feat: stabilize `cargo update --precise <yanked>` (rust-lang/cargo#13974) - Update openssl-src to 111.28.2+1.1.1w (rust-lang/cargo#13976) r? ghost
ehuss
added a commit
to ehuss/cargo
that referenced
this pull request
Jan 4, 2025
This no longer generates the same error message for the same reason that it changed for linux in rust-lang#13970. Note that Windows does things slightly differently, and doesn't need adjustment.
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Jan 4, 2025
This no longer generates the same error message for the same reason that it changed for linux in #13970. Note that Windows does things slightly differently, and doesn't need adjustment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
libgit2 disallows overriding errors from certificate check since v1.8.0,
so we store the error additionally and unwrap it later.
How should we test and review this PR?
I believe it is due to this change: libgit2/libgit2@9a9f220
Actually, in the doc of
git_error_setit does state that the custom message might be overridden by libgit2 internals.I am not sure if this should be fixed in upstream libgit2 or by our own,
but it's better to do it now then waiting for libgit2 1.8.2
Additional information
r? ehuss