build_helper: handle emails containing square brackets #140675
+41
−9
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
|
rustbot has assigned @Mark-Simulacrum. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
r? @Kobzol |
@rustbot author |
rustbot
added
S-waiting-on-author
The `git` API shells out to `git rev-list` and was directly passing an email string to the command's `--author` flag. That flag interprets its arguments as a regular expression, meaning that characters like square brackets (`[]`) in the email string made the command fail to find a commit matching the author e-mail This commit escapes the email string prior to passing it to `git rev-list`. The change is tested in the `bootstrap` crate because it contains the testing infrastructure to create temporary git repositories. fixes rust-lang#140669
japaric
force-pushed
the
ja/gh140669-stage0-square-brackets
branch
from
b2ae2d2 to
7753ce7
Compare
Kobzol
reviewed
May 20, 2025
| @@ -9,6 +9,16 @@ pub struct GitConfig<'a> { | |||
| pub git_merge_commit_email: &'a str, | |||
| } | |||
|
|
|||
| impl GitConfig<'_> { | |||
There was a problem hiding this comment.
Nit: could you move this to a free function, such as cli_escape_author_email? To make it clear from the name what it does.
|
☔ The latest upstream changes (presumably #119899) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
The
gitAPI shells out togit rev-listand was directly passing an email string to the command's--authorflag. That flag interprets its arguments as a regular expression, meaning that characters like square brackets ([]) in the email string made the command fail to find a commit matching the author e-mailThis commit escapes the email string prior to passing it to
git rev-list.The change is tested in the
bootstrapcrate because it contains the testing infrastructure to create temporary git repositories.fixes #140669