Skip to content

libexpr: Clear GIT_DIR/GIT_WORK_TREE/GIT_COMMON_DIR env vars when doing git status for dirty zone detection #23

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

Merged
lilyinstarlight merged 1 commit into from
Apr 30, 2026
Merged

libexpr: Clear GIT_DIR/GIT_WORK_TREE/GIT_COMMON_DIR env vars when doing git status for dirty zone detection #23

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
21 changes: 15 additions & 6 deletions src/libexpr/eval.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,19 +681,28 @@ const std::map<std::string, EvalState::ZoneDirtyInfo> & EvalState::getTectonixDi
tectonixDirtyZones[zonePath] = {};
}

// Create git command environment with environment variables
// GIT_DIR/GIT_WORK_TREE/GIT_COMMON_DIR removed since they affect
// git repository discovery
StringMap gitEnvironment = getEnv();
gitEnvironment.erase("GIT_DIR");
gitEnvironment.erase("GIT_WORK_TREE");
gitEnvironment.erase("GIT_COMMON_DIR");

// Get dirty files via git status with -z for NUL-separated output
// This handles filenames with special characters correctly
auto checkoutPath = settings.tectonixCheckoutPath.get();
std::string gitStatusOutput;
try {
gitStatusOutput = runProgram("git", true, {"-C", checkoutPath, "status", "--porcelain", "-z"});
} catch (ExecError & e) {
auto [gitStatusCode, gitStatusOutput] = runProgram(
{.program = "git",
.args = {"-C", checkoutPath, "status", "--porcelain", "-z"},
.environment = gitEnvironment});
if (!statusOk(gitStatusCode)) {
// If git status fails, treat all zones as clean (fallback)
// This ensures call_once completes and we don't retry with partial state
warn(
"failed to get git status for dirty zone detection in '%s': %s; treating all zones as clean",
"failed to get git status for dirty zone detection in '%s': program 'git' %s; treating all zones as clean",
checkoutPath,
e.what());
statusToString(gitStatusCode));
return;
}

Expand Down