Fixed bug in create/rename repository if the root group alias is specified (issue...

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 333623438d090813740f070061877f9ad82d74a6..ad7a993037921c0f40fa601aaa803448a925c588 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -11,6 +11,7 @@ If you are updating from an earlier release AND you have indexed branches with t
 \r
 #### fixes\r
 \r
+- Fixed bug in create/rename repository if you explicitly specified the alias for the root group (e.g. main/myrepo) (issue 143)\r
 - Wrapped Markdown parser with improved exception handler (issue 142)\r
 - Fixed duplicate entries in repository cache (issue 140)\r
 - Fixed connection leak in LDAPUserService (issue 139)\r

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index e945fa06f29ac252f3475eef698c4baa3cb30556..7fbd3efdc9b955b2aa8171dd6764a99f846016f8 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1547,6 +1547,13 @@ public class GitBlit implements ServletContextListener {
        public void updateRepositoryModel(String repositoryName, RepositoryModel repository,\r
                        boolean isCreate) throws GitBlitException {\r
                Repository r = null;\r
+               String projectPath = StringUtils.getFirstPathElement(repository.name);\r
+               if (!StringUtils.isEmpty(projectPath)) {\r
+                       if (projectPath.equalsIgnoreCase(getString(Keys.web.repositoryRootGroupName, "main"))) {\r
+                               // strip leading group name\r
+                               repository.name = repository.name.substring(projectPath.length() + 1);\r
+                       }\r
+               }\r
                if (isCreate) {\r
                        // ensure created repository name ends with .git\r
                        if (!repository.name.toLowerCase().endsWith(org.eclipse.jgit.lib.Constants.DOT_GIT_EXT)) {\r