Fixed an incorrect candidate submodule name (issue-266)

diff --git a/releases.moxie b/releases.moxie
index 85419d678c75534842b9562adae7a67ea1418737..9dd55d70ff602a3c992b489c2fca9a1b5b48d9c5 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -51,6 +51,7 @@ r17: {
         - Ignore orphan ".git" folder in the repositories root folder (issue-256)\r
         - 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)\r
         - Fixed committer verification with merge commits (issue-264)\r
+        - Fixed bug in submodule repository linking (issue-266)\r
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped\r
         - Added more error checking to blob page and blame page\r
         - Disable SNI extensions for client SSL connections\r

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 774604fa81f59e6536a1ba127844067530edb4dd..372b68d0493ac37a8a997e4666a223f27a0bd7d3 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -446,7 +446,7 @@ public abstract class RepositoryPage extends RootPage {
                        if (submoduleName.lastIndexOf('/') > -1) {\r
                                String name = submoduleName.substring(submoduleName.lastIndexOf('/') + 1);\r
                                candidates.add(currentPath + StringUtils.stripDotGit(name));\r
-                               candidates.add(currentPath + candidates.get(candidates.size() - 1) + ".git");\r
+                               candidates.add(candidates.get(candidates.size() - 1) + ".git");\r
                        }\r
 \r
                        // absolute\r

diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 49d8ae5f0eb55e740d8d782240609f9ae92483d3..5e03e01b5b945eea6bb5aa59a8e90d4d3568efac 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -309,7 +309,7 @@ public class HistoryPanel extends BasePanel {
                        if (submoduleName.lastIndexOf('/') > -1) {\r
                                String name = submoduleName.substring(submoduleName.lastIndexOf('/') + 1);\r
                                candidates.add(currentPath + StringUtils.stripDotGit(name));\r
-                               candidates.add(currentPath + candidates.get(candidates.size() - 1) + ".git");\r
+                               candidates.add(candidates.get(candidates.size() - 1) + ".git");\r
                        }\r
 \r
                        // absolute\r