Fixed regression with individually symlinked repositories (issue 217)

diff --git a/releases.moxie b/releases.moxie
index 0598914271c07653c6ec8e6faba19cf0a02bebe4..37200e4225992c81865a88dbc1d6e0711b31a53f 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -15,6 +15,7 @@ r17: {
         - Fixed incorrect icon file name for .doc files (issue 200)\r
         - Do not queue emails with no recipients (issue 201)\r
         - Disable view and blame links for deleted blobs (issue 216)\r
+        - Fixed 1.2.x regression with individually symlinked repositories (issue 217)\r
         - Fixed NPE in 1.2.1 Federation Client (issue 219)\r
         - Fixed extracting Groovy scripts on Express installs (issue 220)\r
         - Ensure Redmine url is properly formatted (issue 223)\r

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 7c6a535067716063a24932af78aeaf7a0cc7cab0..65dc559ccc3865a97e6dfaefb58a7bbab58cd252 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -1656,6 +1656,11 @@ public class GitBlit implements ServletContextListener {
                } else {\r
                        model.name = com.gitblit.utils.FileUtils.getRelativePath(basePath, r.getDirectory().getParentFile());\r
                }\r
+               if (StringUtils.isEmpty(model.name)) {\r
+                       // Repository is NOT located relative to the base folder because it\r
+                       // is symlinked.  Use the provided repository name.\r
+                       model.name = repositoryName;\r
+               }\r
                model.hasCommits = JGitUtils.hasCommits(r);\r
                model.lastChange = JGitUtils.getLastChange(r);\r
                model.projectPath = StringUtils.getFirstPathElement(repositoryName);\r