Skip to content

Commit 4506bfb

Browse files
authored
Merge pull request #1990 from gitgitgadget/fix-git-exec-path
CIHelper: do set the `GIT_EXEC_PATH` correctly
2 parents ffb2dd5 + 980823e commit 4506bfb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/ci-helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class CIHelper {
8686
// see https://github.com/desktop/dugite/blob/v2.7.1/lib/git-environment.ts#L44-L64
8787
// Also: We cannot use `await git(["--exec-path"]);` because that would use Dugite, which would
8888
// override `GIT_EXEC_PATH` and then `git --exec-path` would report _that_...
89-
process.env.GIT_EXEC_PATH = spawnSync("/usr/bin/git", ["--exec-path"]).stdout.toString("utf-8").trimEnd();
89+
process.env.GIT_EXEC_PATH = spawnSync(gitPath, ["--exec-path"]).stdout.toString("utf-8").trimEnd();
9090
break;
9191
}
9292

0 commit comments

Comments
 (0)