Skip to content

Improve comments in a couple private functions #1594

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

Merged
merged 2 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions gix-path/src/env/git/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ fn git_cmd(executable: PathBuf) -> Command {
//
// Separately from that, we can't use --system here, because scopes treated higher than the
// system scope are possible. This commonly happens on macOS with Apple Git, where the config
// file under `/Library` is shown as an "unknown" scope but takes precedence over the system
// scope. Although `GIT_CONFIG_NOSYSTEM` will suppress this as well, passing --system omits it.
// file under `/Library` or `/Applications` is shown as an "unknown" scope but takes precedence
// over the system scope. Although `GIT_CONFIG_NOSYSTEM` suppresses this scope along with the
// system scope, passing --system selects only the system scope and omit this "unknown" scope.
cmd.args(["config", "-lz", "--show-origin", "--name-only"])
.current_dir(cwd)
.env_remove("GIT_CONFIG")
Expand Down
2 changes: 1 addition & 1 deletion tests/tools/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ fn configure_command<'a, I: IntoIterator<Item = S>, S: AsRef<OsStr>>(
args: I,
script_result_directory: &Path,
) -> &'a mut std::process::Command {
// For simplicity, we extend the `MSYS` variable from from our own environment. This disregards
// For simplicity, we extend the `MSYS` variable from our own environment. This disregards
// state from any prior `cmd.env("MSYS")` or `cmd.env_remove("MSYS")` calls. Such calls should
// either be avoided, or made after this function returns (but before spawning the command).
let mut msys_for_git_bash_on_windows = env::var_os("MSYS").unwrap_or_default();
Expand Down
Loading