The Unified and Autonomous Development Platform
fix the issue that pull request between two unrelated commits of different repository can result in exception
robin shen5864072bf8aa
diff --git a/core/src/main/java/com/gitplex/server/git/GitUtils.java b/core/src/main/java/com/gitplex/server/git/GitUtils.javaindex 172a07920f..572790b2d8 100644--- a/core/src/main/java/com/gitplex/server/git/GitUtils.java+++ b/core/src/main/java/com/gitplex/server/git/GitUtils.java@@ -42,7 +42,6 @@ import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.util.SystemReader;import org.eclipse.jgit.util.io.NullOutputStream;-import com.gitplex.server.git.command.CalcMergeBaseCommand;import com.gitplex.server.git.command.FetchCommand;import com.gitplex.server.git.exception.ObsoleteCommitException;import com.gitplex.server.git.exception.RefUpdateException;@@ -327,15 +326,10 @@ public class GitUtils {@Nullablepublic static ObjectId getMergeBase(Repository repository1, ObjectId commit1,Repository repository2, ObjectId commit2, @Nullable String fetchRef) {- if (repository1.getDirectory()!=null && repository1.getDirectory().equals(repository2.getDirectory())) {- return GitUtils.getMergeBase(repository1, commit1, commit2);- } else {+ if (repository1.getDirectory() == null || !repository1.getDirectory().equals(repository2.getDirectory())) {fetch(repository2, commit2, repository1, fetchRef);- return ObjectId.fromString(new CalcMergeBaseCommand(repository1.getDirectory())- .rev1(commit1.name())- .rev2(commit2.name())- .call());}+ return GitUtils.getMergeBase(repository1, commit1, commit2);}public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository,diff --git a/core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.java b/core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.javadeleted file mode 100644index 016c7b534a..0000000000--- a/core/src/main/java/com/gitplex/server/git/command/CalcMergeBaseCommand.java+++ /dev/null@@ -1,67 +0,0 @@-package com.gitplex.server.git.command;--import java.io.File;--import javax.annotation.Nullable;--import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.gitplex.server.util.execution.Commandline;-import com.gitplex.server.util.execution.LineConsumer;-import com.google.common.base.Preconditions;--public class CalcMergeBaseCommand extends GitCommand<String> {-- private static final Logger logger = LoggerFactory.getLogger(CalcMergeBaseCommand.class);-- private String rev1;-- private String rev2;-- public CalcMergeBaseCommand(final File repoDir) {- super(repoDir);- }-- public CalcMergeBaseCommand rev1(final String rev1) {- this.rev1 = rev1;- return this;- }-- public CalcMergeBaseCommand rev2(final String rev2) {- this.rev2 = rev2;- return this;- }-- @Override- public @Nullable String call() {- Preconditions.checkNotNull(rev1, "rev1 has to be specified.");- Preconditions.checkNotNull(rev2, "rev2 has to be specified.");-- final String commonAncestor[] = new String[]{null};-- Commandline cmd = cmd();-- cmd.addArgs("merge-base", rev1, rev2);-- cmd.execute(new LineConsumer() {-- @Override- public void consume(String line) {- if (line.trim().length() != 0)- commonAncestor[0] = line.trim();- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(line);- }-- }).checkReturnCode();-- return commonAncestor[0];- }--}diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.javaindex 6fff5c58c8..b74cd6f412 100644--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java@@ -15,7 +15,6 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {-}});