Skip to content

The Unified and Autonomous Development Platform

Fix git windows safe directory

Robin Shen18e43995c751
diff --git a/pom.xml b/pom.xml
index 7f4b88ec20..59a9db605d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -620,7 +620,7 @@
</repositories>
<properties>
<commons.version>2.7.10</commons.version>
- <agent.version>1.7.26</agent.version>
+ <agent.version>1.7.27</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 5d36098955..8de168cab0 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -426,9 +426,11 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
try {
CheckoutFacade checkoutFacade = (CheckoutFacade) facade;
jobLogger.log("Checking out code...");
+
+ Commandline git = new Commandline(AppLoader.getInstance(GitLocation.class).getExecutable());
+
if (hostAuthInfoHome.get() == null)
hostAuthInfoHome.set(FileUtils.createTempDir());
- Commandline git = new Commandline(AppLoader.getInstance(GitLocation.class).getExecutable());
git.environments().put("HOME", hostAuthInfoHome.get().getAbsolutePath());
checkoutFacade.setupWorkingDir(git, hostWorkspace);
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index ab4dd7cd12..fd0aa06a3b 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -217,14 +217,15 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
try {
CheckoutFacade checkoutFacade = (CheckoutFacade) facade;
jobLogger.log("Checking out code...");
+
Commandline git = new Commandline(AppLoader.getInstance(GitLocation.class).getExecutable());
- checkoutFacade.setupWorkingDir(git, workspaceDir);
-
Map<String, String> environments = new HashMap<>();
environments.put("HOME", userDir.getAbsolutePath());
git.environments(environments);
+ checkoutFacade.setupWorkingDir(git, workspaceDir);
+
List<String> trustCertContent = getTrustCertContent();
if (!trustCertContent.isEmpty()) {
installGitCert(new File(userDir, "trust-cert.pem"), trustCertContent,