-
Notifications
You must be signed in to change notification settings - Fork 384
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
Add config level for worktrees #816
base: master
Are you sure you want to change the base?
Conversation
Putting this back on the radar. libgit2/libgit2#6202 is passing tests and out for review; I'm hoping it will be merged in the near future. |
575e518
to
b17a4cc
Compare
Erm, what's going on with https://github.com/rust-lang/git2-rs/actions/runs/8032181003/job/21941280831?pr=816#step:4:398? I don't see any
and a failure to pass
since libgit2-sys fails to build with the proper features: I didn't expect to see the same behavior in CI. @ehuss any wisdom here? I figured it was a result of my dev environment. |
For the ssh memory credential issue, the build.rs will need to be updated to accommodate libgit2/libgit2#6617. In particular, it looks like GIT_SSH_MEMORY_CREDENTIALS was renamed to GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS. The test is also seg-faulting. Here's a backtrace:
|
b17a4cc
to
df398cd
Compare
To fix a segfault at [1], adjust to upstream development[2,3] that changed the shape of this struct. This new field is added in the same style as `custom_headers`. [1]: libgit2.git:39669956fb510fb7b13289f6ce959884969dbebd:src/libgit2/remote.c:2987 [2]: libgit2.git:ecc6f2fb8399d84e5b2bf043376dfc51f43f3e90 [3]: libgit2.git:39669956fb510fb7b13289f6ce959884969dbebd
Adjust to upstream development[1] that changed the name of this compiler flag. [1]: libgit2.git:3fccf7468ba7a9a9f764984435db83f4588ec905
Use the new support in libgit2 for the worktree-config extension.[1] [1]: https://git-scm.com/docs/git-worktree/2.35.1#_configuration_file
df398cd
to
73ade96
Compare
I used |
This uses the new support in libgit2 for the worktree-config extension.
See also libgit2/libgit2#6202.
I suspect there is more work to be done on this PR, but I wanted to create it for tracking purposes. Tasks I can tell are coming:
ConfigLevel
enum