From 80aecb7e33714ba6416710835ca372c4cd28fcad Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 24 May 2013 17:43:16 -0400
Subject: [PATCH] Polish the tag page
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 90fdd40..072475a 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -169,6 +169,7 @@
}
pages.put("commits", new PageRegistration("gb.commits", LogPage.class, params));
pages.put("tree", new PageRegistration("gb.tree", TreePage.class, params));
+ pages.put("compare", new PageRegistration("gb.compare", ComparePage.class, params));
if (GitBlit.getBoolean(Keys.web.allowForking, true)) {
pages.put("forks", new PageRegistration("gb.forks", ForksPage.class, params));
}
@@ -338,7 +339,7 @@
return commit;
}
- private Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {
+ protected Map<String, SubmoduleModel> getSubmodules(RevCommit commit) {
if (submodules == null) {
submodules = new HashMap<String, SubmoduleModel>();
for (SubmoduleModel model : JGitUtils.getSubmodules(r, commit.getTree())) {
@@ -349,7 +350,10 @@
}
protected SubmoduleModel getSubmodule(String path) {
- SubmoduleModel model = submodules.get(path);
+ SubmoduleModel model = null;
+ if (submodules != null) {
+ model = submodules.get(path);
+ }
if (model == null) {
// undefined submodule?!
model = new SubmoduleModel(path.substring(path.lastIndexOf('/') + 1), path, path);
--
Gitblit v1.9.1