From 94793ed10acf996a4b3f9f1a8538a1b997436d9f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:39:31 -0400
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e587863..4d27589 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -109,13 +109,13 @@
}
final boolean isTree = matchingPath == null ? true : matchingPath.isTree();
- final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule();
+ final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule();
// submodule
- SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path);
final String submodulePath;
final boolean hasSubmodule;
- if (submodule != null) {
+ if (isSubmodule) {
+ SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path);
submodulePath = submodule.gitblitPath;
hasSubmodule = submodule.hasSubmodule;
} else {
--
Gitblit v1.9.1