Fix CredentialHelper::add_command #1137
Merged
Conversation
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
aibaars
force-pushed
the
fix-credential-helper
branch
from
16bd0dc to
ef3bca9
Compare
aibaars
force-pushed
the
fix-credential-helper
branch
from
ef3bca9 to
c776e8d
Compare
ehuss
approved these changes
Mar 17, 2025
| fn is_absolute_path(path: &str) -> bool { | ||
| path.starts_with('/') | ||
| || path.starts_with('\\') | ||
| || cfg!(windows) && path.chars().nth(1).is_some_and(|x| x == ':') |
There was a problem hiding this comment.
Just a minor note, this is slightly different from https://github.com/git-for-windows/git/blob/cca1f38702730b35f52c29efd62864b85e85ddcc/compat/win32/path-utils.c#L9-L31, but probably not enough to matter here.
There was a problem hiding this comment.
Yes, git2-rs uses the str type while the git C uses a char* and if I understand the git C code correctly, it just tries to handle the case where the drive letter is a UTF8 character. I'd expect the str::nth function to take care of that already. However, there might indeed be some behaviour differences in corner cases at I'm not aware of.
|
Note that this was relaxed in #429 which previously looked for |
facebook-github-bot
pushed a commit
to facebook/sapling
that referenced
this pull request
May 15, 2025
Summary: # Changelog ## 0.20.2 - 2025-05-05 [0.20.1...0.20.2](rust-lang/git2-rs@git2-0.20.1...git2-0.20.2) ### Added - Added `Status::WT_UNREADABLE`. [#1151](rust-lang/git2-rs#1151) ### Fixed - Added missing codes for `GIT_EDIRECTORY`, `GIT_EMERGECONFLICT`, `GIT_EUNCHANGED`, `GIT_ENOTSUPPORTED`, and `GIT_EREADONLY` to `Error::raw_code`. [#1153](rust-lang/git2-rs#1153) - Fixed missing initialization in `Indexer::new`. [#1160](rust-lang/git2-rs#1160) ## 0.20.1 - 2025-03-17 [0.20.0...0.20.1](rust-lang/git2-rs@git2-0.20.0...git2-0.20.1) ### Added - Added `Repository::branch_upstream_merge()` [#1131](rust-lang/git2-rs#1131) - Added `Index::conflict_get()` [#1134](rust-lang/git2-rs#1134) - Added `Index::conflict_remove()` [#1133](rust-lang/git2-rs#1133) - Added `opts::set_cache_object_limit()` [#1118](rust-lang/git2-rs#1118) - Added `Repo::merge_file_from_index()` and associated `MergeFileOptions` and `MergeFileResult`. [#1062](rust-lang/git2-rs#1062) ### Changed - The `url` dependency minimum raised to 2.5.4 [#1128](rust-lang/git2-rs#1128) - Changed the tracing callback to abort the process if the callback panics instead of randomly detecting the panic in some other function. [#1121](rust-lang/git2-rs#1121) - Credential helper config (loaded with `CredentialHelper::config`) now checks for helpers that start with something that looks like an absolute path, rather than checking for a `/` or `\` anywhere in the helper string (which resolves an issue if the helper had arguments with `/` or `\`). [#1137](rust-lang/git2-rs#1137) ### Fixed - Fixed panic in `Remote::url_bytes` if the url is empty. [#1120](rust-lang/git2-rs#1120) - Fixed incorrect lifetimes on `Patch::delta`, `Patch::hunk`, and `Patch::line_in_hunk`. The return values must not outlive the `Patch`. [#1141](rust-lang/git2-rs#1141) - Bumped requirement to libgit2-sys 0.18.1, which fixes linking of advapi32 on Windows. [#1143](rust-lang/git2-rs#1143) ignore-conflict-markers Reviewed By: JakobDegen Differential Revision: D74659779 fbshipit-source-id: a18bcd8f58bc62c7eedbfa5939a791002e18d7bc
facebook-github-bot
pushed a commit
to facebookincubator/reindeer
that referenced
this pull request
May 15, 2025
Summary: # Changelog ## 0.20.2 - 2025-05-05 [0.20.1...0.20.2](rust-lang/git2-rs@git2-0.20.1...git2-0.20.2) ### Added - Added `Status::WT_UNREADABLE`. [#1151](rust-lang/git2-rs#1151) ### Fixed - Added missing codes for `GIT_EDIRECTORY`, `GIT_EMERGECONFLICT`, `GIT_EUNCHANGED`, `GIT_ENOTSUPPORTED`, and `GIT_EREADONLY` to `Error::raw_code`. [#1153](rust-lang/git2-rs#1153) - Fixed missing initialization in `Indexer::new`. [#1160](rust-lang/git2-rs#1160) ## 0.20.1 - 2025-03-17 [0.20.0...0.20.1](rust-lang/git2-rs@git2-0.20.0...git2-0.20.1) ### Added - Added `Repository::branch_upstream_merge()` [#1131](rust-lang/git2-rs#1131) - Added `Index::conflict_get()` [#1134](rust-lang/git2-rs#1134) - Added `Index::conflict_remove()` [#1133](rust-lang/git2-rs#1133) - Added `opts::set_cache_object_limit()` [#1118](rust-lang/git2-rs#1118) - Added `Repo::merge_file_from_index()` and associated `MergeFileOptions` and `MergeFileResult`. [#1062](rust-lang/git2-rs#1062) ### Changed - The `url` dependency minimum raised to 2.5.4 [#1128](rust-lang/git2-rs#1128) - Changed the tracing callback to abort the process if the callback panics instead of randomly detecting the panic in some other function. [#1121](rust-lang/git2-rs#1121) - Credential helper config (loaded with `CredentialHelper::config`) now checks for helpers that start with something that looks like an absolute path, rather than checking for a `/` or `\` anywhere in the helper string (which resolves an issue if the helper had arguments with `/` or `\`). [#1137](rust-lang/git2-rs#1137) ### Fixed - Fixed panic in `Remote::url_bytes` if the url is empty. [#1120](rust-lang/git2-rs#1120) - Fixed incorrect lifetimes on `Patch::delta`, `Patch::hunk`, and `Patch::line_in_hunk`. The return values must not outlive the `Patch`. [#1141](rust-lang/git2-rs#1141) - Bumped requirement to libgit2-sys 0.18.1, which fixes linking of advapi32 on Windows. [#1143](rust-lang/git2-rs#1143) ignore-conflict-markers Reviewed By: JakobDegen Differential Revision: D74659779 fbshipit-source-id: a18bcd8f58bc62c7eedbfa5939a791002e18d7bc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously the add_helper function would check whether the command contains a
\or/character to determine whether it is absolute. It should have used starts_with instead of contains. In addition an absolute on Windows a path my start with a drive letter. The git cli implements this by checking if the second character is a ':'.See also: https://github.com/git/git/blob/6a64ac7b014fa2cfa7a69af3c253bcd53a94b428/credential.c#L492-L493
Fixes #1136