From 008322bec70a3a20bd00ed2219215a9f42fe0ca5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 08 Jun 2011 20:48:07 -0400 Subject: [PATCH] Blame support finished, requires JGit 1.0.0. Checkstyle. Findbugs. --- src/com/gitblit/GitBlit.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index c6eb613..dcf5a6b 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -142,7 +142,7 @@ public List<String> getRepositoryList() { return JGitUtils.getRepositoryList(repositoriesFolder, exportAll, - storedSettings.getBoolean(Keys.git.nestedRepositories, true)); + storedSettings.getBoolean(Keys.git.searchRepositoriesSubfolders, true)); } public Repository getRepository(String repositoryName) { @@ -225,6 +225,10 @@ boolean isCreate) throws GitBlitException { Repository r = null; if (isCreate) { + // ensure created repository name ends with .git + if (!repository.name.toLowerCase().endsWith(org.eclipse.jgit.lib.Constants.DOT_GIT_EXT)) { + repository.name += org.eclipse.jgit.lib.Constants.DOT_GIT_EXT; + } if (new File(repositoriesFolder, repository.name).exists()) { throw new GitBlitException(MessageFormat.format( "Can not create repository ''{0}'' because it already exists.", @@ -232,7 +236,7 @@ } // create repository logger.info("create repository " + repository.name); - r = JGitUtils.createRepository(repositoriesFolder, repository.name, true); + r = JGitUtils.createRepository(repositoriesFolder, repository.name); } else { // rename repository if (!repositoryName.equalsIgnoreCase(repository.name)) { -- Gitblit v1.9.1