diff options
| author | Peter Allin <peter@peca.dk> | 2012-08-07 13:00:07 +0200 |
|---|---|---|
| committer | Peter Allin <peter@peca.dk> | 2012-08-07 13:00:07 +0200 |
| commit | a02998032e7077e3e744d5725485023097bf30f0 (patch) | |
| tree | 44d8dfd0d430cc8823711e7640b50328d930ec78 /src/com | |
| parent | 65f55e2a2cdbce33ed4d2d7111b49ff00b2fd575 (diff) | |
| download | gitblit-a02998032e7077e3e744d5725485023097bf30f0.tar.gz gitblit-a02998032e7077e3e744d5725485023097bf30f0.zip | |
Don't try to index git submodules, they are seperate repositories and should be handled seperately.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/gitblit/LuceneExecutor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java index 6c5a60d2..eafb5168 100644 --- a/src/com/gitblit/LuceneExecutor.java +++ b/src/com/gitblit/LuceneExecutor.java @@ -69,6 +69,7 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Version;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectLoader;
import org.eclipse.jgit.lib.ObjectReader;
@@ -493,7 +494,9 @@ public class LuceneExecutor implements Runnable { Map<String, ObjectId> paths = new TreeMap<String, ObjectId>();
while (treeWalk.next()) {
- paths.put(treeWalk.getPathString(), treeWalk.getObjectId(0));
+ if (treeWalk.getFileMode(0) != FileMode.GITLINK) {
+ paths.put(treeWalk.getPathString(), treeWalk.getObjectId(0));
+ }
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
|