summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--releases.moxie1
-rw-r--r--src/main/java/com/gitblit/utils/JGitUtils.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/releases.moxie b/releases.moxie
index 50a54e7e..c68ef199 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -31,6 +31,7 @@ r17: {
- Fixed AddIndexedBranch tool --branch parameter (issue 247)
- Improve NPE handling for hook script enumeration (issue-253)
- Workaround missing commit information in blame page (JGit bug 374382, issue-254)
+ - Ignore orphan ".git" folder in the repositories root folder (issue-256)
changes:
- Improved error logging for servlet containers which provide a null contextFolder (issue 199)
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index 7242e33d..9dabebe6 100644
--- 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,
onlyBare, searchSubfolders, depth, patterns));
StringUtils.sortRepositorynames(list);
+ list.remove(".git"); // issue-256
return list;
}