Misc fixes for LibGit2 #18066
Merged
Misc fixes for LibGit2 #18066
Conversation
This file contains 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
An SSH URL with a path uses a colon between the host and the path: git@github.com:JuliaLang/Example.jl (correct) git@github.com/JuliaLang/Example.jl (incorrect)
| @@ -160,7 +160,7 @@ function authenticate_userpass(creds::UserPasswordCredentials, libgit2credptr::P | |||
| urlusername : username) | |||
| userpass = prompt("Password for '$schema$username@$host'", password=true) | |||
| end | |||
| (creds.user != username) || (creds.pass != userpass) && reset!(creds) | |||
| ((creds.user != username) || (creds.pass != userpass)) && reset!(creds) | |||
There was a problem hiding this comment.
Fixes operator precedence issue. Mirrors 1d5a427
|
LGTM, thanks! |
| (?<host>[A-Za-z0-9\-\.]+) | ||
| (?:\:(?<port>\d+)?)? | ||
| (?<path>.*?)$ | ||
| """x |
There was a problem hiding this comment.
Fixes several things with the original regex including:
- Doesn't fail or absorb password information into the username
- SSH URLs would have the colon included in the path capture. e.g. "git@github.com:JuliaLang/Example.jl" would have the path ":JuliaLang/Example.jl"
- Allows more complicated usernames including ones using hypens
- Switched to using named groups for clarity
tkelman
added
libgit2
Test was only working for environments which had GitHub SSH keys setup.
Added a new explicit SSH protocol test which generated other changes.
|
Travis failure is unrelated to the changes. PR should be ready to go. |
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.
No description provided.