Always add git user info to run_command #759
Open
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
Signed-off-by: dvermd <[email protected]>
dvermd
force-pushed
the
default_git_user_info
branch
from
7fc7ee3 to
13b4c10
Compare
antoyo
reviewed
Sep 6, 2025
Comment on lines
12
to
45
| fn run_git_command( | ||
| command: &dyn AsRef<OsStr>, | ||
| input: &[&dyn AsRef<OsStr>], | ||
| cwd: Option<&Path>, | ||
| ) -> Result<Output, String> { | ||
| // This is needed on systems where nothing is configured. | ||
| // git really needs something here, or it will fail. | ||
| // Even using --author is not enough. | ||
| let git_cmd = &[ | ||
| &"git" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"user.name=None" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"[email protected]" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"core.autocrlf=false" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"commit.gpgSign=false" as &dyn AsRef<OsStr>, | ||
| ] | ||
| .into_iter() | ||
| .chain([command]) | ||
| .chain(input.iter().cloned()) | ||
| .collect::<Vec<_>>()[..]; | ||
| run_command(git_cmd, cwd) | ||
| } | ||
|
|
||
| fn run_git_command_with_output( | ||
| command: &dyn AsRef<OsStr>, | ||
| input: &[&dyn AsRef<OsStr>], | ||
| cwd: Option<&Path>, | ||
| ) -> Result<(), String> { | ||
| // This is needed on systems where nothing is configured. | ||
| // git really needs something here, or it will fail. | ||
| // Even using --author is not enough. | ||
| let git_cmd = &[ | ||
| &"git" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"user.name=None" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"[email protected]" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"core.autocrlf=false" as &dyn AsRef<OsStr>, | ||
| &"-c" as &dyn AsRef<OsStr>, | ||
| &"commit.gpgSign=false" as &dyn AsRef<OsStr>, | ||
| ] | ||
| .into_iter() | ||
| .chain([command]) | ||
| .chain(input.iter().cloned()) | ||
| .collect::<Vec<_>>()[..]; | ||
| run_command_with_output(git_cmd, cwd) | ||
| } |
There was a problem hiding this comment.
There's some duplication between these 2 functions.
Could you please refactor these functions to avoid this?
There was a problem hiding this comment.
Moved the command definitions to a const
dvermd
force-pushed
the
default_git_user_info
branch
from
13b4c10 to
99fabbf
Compare
Signed-off-by: dvermd <[email protected]>
dvermd
force-pushed
the
default_git_user_info
branch
from
99fabbf to
bd303ca
Compare
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.
This PR always pass the
user.name,user.email,core.autocrlfandcommit.gpgSigngit parameters to therun_commandandrun_command_with_outputfunctions.With this PR, I managed to successfully run
./y.sh prepareafter a./y.sh clean all" with and withoutuser.nameanduser.email` parameters defined for the repo.Fixes #731