Skip to content

Commit ab8880f

Browse files
authored
Merge pull request #1594 from EliahKagan/comments
Improve comments in a couple private functions
2 parents 72daa46 + 1526b01 commit ab8880f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

gix-path/src/env/git/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ fn git_cmd(executable: PathBuf) -> Command {
136136
//
137137
// Separately from that, we can't use --system here, because scopes treated higher than the
138138
// system scope are possible. This commonly happens on macOS with Apple Git, where the config
139-
// file under `/Library` is shown as an "unknown" scope but takes precedence over the system
140-
// scope. Although `GIT_CONFIG_NOSYSTEM` will suppress this as well, passing --system omits it.
139+
// file under `/Library` or `/Applications` is shown as an "unknown" scope but takes precedence
140+
// over the system scope. Although `GIT_CONFIG_NOSYSTEM` suppresses this scope along with the
141+
// system scope, passing --system selects only the system scope and omit this "unknown" scope.
141142
cmd.args(["config", "-lz", "--show-origin", "--name-only"])
142143
.current_dir(cwd)
143144
.env_remove("GIT_CONFIG")

tests/tools/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ fn configure_command<'a, I: IntoIterator<Item = S>, S: AsRef<OsStr>>(
594594
args: I,
595595
script_result_directory: &Path,
596596
) -> &'a mut std::process::Command {
597-
// For simplicity, we extend the `MSYS` variable from from our own environment. This disregards
597+
// For simplicity, we extend the `MSYS` variable from our own environment. This disregards
598598
// state from any prior `cmd.env("MSYS")` or `cmd.env_remove("MSYS")` calls. Such calls should
599599
// either be avoided, or made after this function returns (but before spawning the command).
600600
let mut msys_for_git_bash_on_windows = env::var_os("MSYS").unwrap_or_default();

0 commit comments

Comments
 (0)