From f2c4fa73e484e7abf70a2969def6fd79c3821284 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 18 Jun 2013 21:52:09 -0400
Subject: [PATCH] Ignore orphaned .git folder in repositories folder (issue-256)
---
src/main/java/com/gitblit/utils/JGitUtils.java | 1 +
releases.moxie | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 50a54e7..c68ef19 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -31,6 +31,7 @@
- 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 7242e33..9dabebe 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -297,6 +297,7 @@
list.addAll(getRepositoryList(repositoriesFolder.getAbsolutePath(), repositoriesFolder,
onlyBare, searchSubfolders, depth, patterns));
StringUtils.sortRepositorynames(list);
+ list.remove(".git"); // issue-256
return list;
}
--
Gitblit v1.9.1