Fixed an incorrect candidate submodule name (issue-266)

Author: gitblit

releases.moxie

@@ -51,6 +51,7 @@ r17: {
 	 - 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

src/main/java/com/gitblit/wicket/pages/RepositoryPage.java

@@ -446,7 +446,7 @@ protected SubmoduleModel getSubmodule(String path) {
 			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

src/main/java/com/gitblit/wicket/panels/HistoryPanel.java

@@ -309,7 +309,7 @@ protected SubmoduleModel getSubmodule(Map<String, SubmoduleModel> submodules, St
 			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