From 88fb67f6cfdef7a3d44691aca623d3486fec3655 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 10 Aug 2012 17:37:36 -0400
Subject: Improve submodule checking in LuceneExecutor (issue-119)

---
 src/com/gitblit/models/PathModel.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/com/gitblit/models')

diff --git a/src/com/gitblit/models/PathModel.java b/src/com/gitblit/models/PathModel.java
index c78b300c..9bb7eb73 100644
--- a/src/com/gitblit/models/PathModel.java
+++ b/src/com/gitblit/models/PathModel.java
@@ -46,6 +46,10 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 		this.commitId = commitId;
 	}
 
+	public boolean isSubmodule() {
+		return FileMode.GITLINK.equals(mode);
+	}
+	
 	public boolean isTree() {
 		return FileMode.TREE.equals(mode);
 	}
@@ -71,6 +75,13 @@ public class PathModel implements Serializable, Comparable<PathModel> {
 		if (isTree && otherTree) {
 			return path.compareTo(o.path);
 		} else if (!isTree && !otherTree) {
+			if (isSubmodule() && o.isSubmodule()) {
+				return path.compareTo(o.path);
+			} else if (isSubmodule()) {
+				return -1;
+			} else if (o.isSubmodule()) {
+				return 1;
+			}
 			return path.compareTo(o.path);
 		} else if (isTree && !otherTree) {
 			return -1;
-- 
cgit v1.2.3