Skip to content

The Unified and Autonomous Development Platform

chore: fix submodule order

Robin Shen7489618b8db2
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobIdent.java b/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
index fe60dead8e..8d1893aa77 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobIdent.java
@@ -122,12 +122,12 @@ public class BlobIdent implements Serializable, Comparable<BlobIdent> {
@Override
public int compareTo(BlobIdent ident) {
- if (isTree()) {
- if (ident.isTree())
+ if (isTree() || isGitLink() || isSymbolLink()) {
+ if (ident.isTree() || ident.isGitLink() || ident.isSymbolLink())
return GitUtils.comparePath(path, ident.path);
else
return -1;
- } else if (ident.isTree()) {
+ } else if (ident.isTree() || ident.isGitLink() || ident.isSymbolLink()) {
return 1;
} else {
return GitUtils.comparePath(path, ident.path);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
index d1e4bde0d5..81f0e53b8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
@@ -59,18 +59,18 @@ public class FolderViewPanel extends Panel {
private final BlobRenderContext context;
- private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<List<BlobIdent>>() {
+ private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<>() {
@Override
protected List<BlobIdent> load() {
- List<BlobIdent> children = getGitService().getChildren(context.getProject(), getCommitId(),
+ List<BlobIdent> children = getGitService().getChildren(context.getProject(), getCommitId(),
context.getBlobIdent().path, BlobIdentFilter.ALL, true);
- for (BlobIdent child: children)
+ for (BlobIdent child : children)
child.revision = context.getBlobIdent().revision;
-
- BlobIdent oldBuildSpecIdent = new BlobIdent(context.getBlobIdent().revision,
+
+ BlobIdent oldBuildSpecIdent = new BlobIdent(context.getBlobIdent().revision,
".onedev-buildspec", FileMode.REGULAR_FILE.getBits());
- BlobIdent buildSpecIdent = new BlobIdent(context.getBlobIdent().revision,
+ BlobIdent buildSpecIdent = new BlobIdent(context.getBlobIdent().revision,
BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());
if (children.contains(oldBuildSpecIdent)) {
children.remove(oldBuildSpecIdent);
@@ -82,7 +82,7 @@ public class FolderViewPanel extends Panel {
}
return children;
}
-
+
};
private final IModel<BlobIdent> readmeModel = new LoadableDetachableModel<BlobIdent>() {