Ignore orphaned .git folder in repositories folder (issue-256)

diff --git a/releases.moxie b/releases.moxie
index 50a54e7ee312a5b2959d1916f479fa246a952e31..c68ef1996a273c69f297f225e93f345b716c1ac7 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -31,6 +31,7 @@ r17: {
         - Fixed AddIndexedBranch tool --branch parameter (issue 247)  \r
         - Improve NPE handling for hook script enumeration (issue-253)\r
         - Workaround missing commit information in blame page (JGit bug 374382, issue-254) \r
+        - Ignore orphan ".git" folder in the repositories root folder (issue-256)\r
 \r
        changes:\r
         - Improved error logging for servlet containers which provide a null contextFolder (issue 199)\r

diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 7242e33da9f5dcb685bb5963a136974ba5b6f9cb..9dabebe69800246275f201de335de32fcf2570cb 100644 (file)
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -297,6 +297,7 @@ public class JGitUtils {
                list.addAll(getRepositoryList(repositoriesFolder.getAbsolutePath(), repositoriesFolder,\r
                                onlyBare, searchSubfolders, depth, patterns));\r
                StringUtils.sortRepositorynames(list);\r
+               list.remove(".git"); // issue-256\r
                return list;\r
        }\r
 \r