Skip to content
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.

Sign up for GitHub

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

Fix removing git env vars #176

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Fix removing git env vars #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions src/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub enum Error {

pub static GIT: LazyLock<Result<PathBuf, which::Error>> = LazyLock::new(|| which::which("git"));

static GIT_ENV: LazyLock<Vec<(String, String)>> = LazyLock::new(|| {
static GIT_ENV_REMOVE: LazyLock<()> = LazyLock::new(|| {
let keep = &[
"GIT_EXEC_PATH",
"GIT_SSH",
Expand All @@ -33,20 +33,23 @@ static GIT_ENV: LazyLock<Vec<(String, String)>> = LazyLock::new(|| {
"GIT_ASKPASS",
];

std::env::vars()
.filter(|(k, _)| {
!k.starts_with("GIT_")
|| k.starts_with("GIT_CONFIG_KEY_")
|| k.starts_with("GIT_CONFIG_VALUE_")
|| keep.contains(&k.as_str())
})
.collect()
let to_remove = std::env::vars().filter(|(k, _)| {
k.starts_with("GIT_")
&& !k.starts_with("GIT_CONFIG_KEY_")
&& !k.starts_with("GIT_CONFIG_VALUE_")
&& !keep.contains(&k.as_str())
});

for (k, _) in to_remove {
unsafe { std::env::remove_var(&k) };
}
});

pub fn git_cmd(summary: &str) -> Result<Cmd, Error> {
let mut cmd = Cmd::new(GIT.as_ref().map_err(|&e| Error::GitNotFound(e))?, summary);
cmd.arg("-c").arg("core.useBuiltinFSMonitor=false");
cmd.envs(GIT_ENV.iter().cloned());

LazyLock::force(&GIT_ENV_REMOVE);

Ok(cmd)
}
Expand Down
Loading