From 5e3771786cf17ccb74911afac298caafd6f0da04 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Jul 2013 19:58:51 -0400
Subject: [PATCH] Fixed an incorrect candidate submodule name (issue-266)
---
src/main/java/com/gitblit/wicket/pages/RepositoryPage.java | 2 +-
releases.moxie | 1 +
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 85419d6..9dd55d7 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -51,6 +51,7 @@
- Ignore orphan ".git" folder in the repositories root folder (issue-256)
- Fixed bug where a null permission was added to a user model on a repository rename when the permission had really been inherited from a team membership (issue-259)
- Fixed committer verification with merge commits (issue-264)
+ - Fixed bug in submodule repository linking (issue-266)
- Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
- Added more error checking to blob page and blame page
- Disable SNI extensions for client SSL connections
diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 774604f..372b68d 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -446,7 +446,7 @@
if (submoduleName.lastIndexOf('/') > -1) {
String name = submoduleName.substring(submoduleName.lastIndexOf('/') + 1);
candidates.add(currentPath + StringUtils.stripDotGit(name));
- candidates.add(currentPath + candidates.get(candidates.size() - 1) + ".git");
+ candidates.add(candidates.get(candidates.size() - 1) + ".git");
}
// absolute
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 49d8ae5..5e03e01 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -309,7 +309,7 @@
if (submoduleName.lastIndexOf('/') > -1) {
String name = submoduleName.substring(submoduleName.lastIndexOf('/') + 1);
candidates.add(currentPath + StringUtils.stripDotGit(name));
- candidates.add(currentPath + candidates.get(candidates.size() - 1) + ".git");
+ candidates.add(candidates.get(candidates.size() - 1) + ".git");
}
// absolute
--
Gitblit v1.9.1