archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue #1017 - Branch page crash when syncing

Browse Source
This commit is contained in:
Robin Shen 2022-12-03 15:10:58 +08:00
parent 6e9953468c
commit 25fb9fc0cf
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java
View File

@ -6,6 +6,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.eclipse.jgit.lib.ObjectId;
@ -23,6 +24,7 @@ import com.google.common.collect.Maps;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
@ -154,6 +156,38 @@ public class PullRepository extends SyncRepository {
}
}).checkReturnCode();
if (defaultBranch == null) {
if (targetProject.getObjectId("refs/heads/master", false) != null) {
targetProject.setDefaultBranch("master");
} else if (targetProject.getObjectId("refs/heads/main", false) != null) {
targetProject.setDefaultBranch("main");
} else {
git.clearArgs();
git.addArgs("branch");
AtomicReference<String> firstBranch = new AtomicReference<>(null);
git.execute(new LineConsumer() {
@Override
public void consume(String line) {
if (firstBranch.get() == null)
firstBranch.set(StringUtils.stripStart(line.trim(), "*"));
}
}, new LineConsumer() {
@Override
public void consume(String line) {
logger.warning(line);
}
}).checkReturnCode();
if (firstBranch.get() != null)
targetProject.setDefaultBranch(firstBranch.get());
}
}
} finally {
Map<String, ObjectId> newCommitIds = getCommitIds(targetProject);
MapDifference<String, ObjectId> difference = Maps.difference(oldCommitIds, newCommitIds);