The Unified and Autonomous Development Platform
Fix the issue that shallow clone/fetch does not work
Robin Shen584ea2122772
diff --git a/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java b/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.javaindex 1221ef27be..b5c165852f 100644--- a/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/UploadCommand.java@@ -4,6 +4,7 @@ import java.io.File;import java.io.InputStream;import java.io.OutputStream;import java.util.Map;+import java.util.concurrent.atomic.AtomicBoolean;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -11,6 +12,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import io.onedev.commons.utils.command.Commandline;+import io.onedev.commons.utils.command.ExecuteResult;import io.onedev.commons.utils.command.LineConsumer;public class UploadCommand extends GitCommand<Void> {@@ -43,14 +45,24 @@ public class UploadCommand extends GitCommand<Void> {Commandline cmd = cmd();cmd.addArgs("upload-pack", "--stateless-rpc", ".");- cmd.execute(output, new LineConsumer() {+ AtomicBoolean toleratedErrors = new AtomicBoolean(false);+ ExecuteResult result = cmd.execute(output, new LineConsumer() {@Overridepublic void consume(String line) {- logger.error(line);+ // This error may happen during a normal shallow fetch/clone+ if (line.contains("The remote end hung up unexpectedly")) {+ toleratedErrors.set(true);+ logger.debug(line);+ } else {+ logger.error(line);+ }}- }, input).checkReturnCode();+ }, input);++ if (result.getReturnCode() != 0 && !toleratedErrors.get())+ throw result.buildException();return null;}