diff options
| author | James Moger <james.moger@gitblit.com> | 2013-06-18 21:52:09 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-06-18 21:52:09 -0400 |
| commit | f2c4fa73e484e7abf70a2969def6fd79c3821284 (patch) | |
| tree | d7f7e721e9396d55a7ba49e85c0583b139df385c | |
| parent | 80b000534188e4cef93475aefd3e6b658419ed26 (diff) | |
| download | gitblit-f2c4fa73e484e7abf70a2969def6fd79c3821284.tar.gz gitblit-f2c4fa73e484e7abf70a2969def6fd79c3821284.zip | |
Ignore orphaned .git folder in repositories folder (issue-256)
| -rw-r--r-- | releases.moxie | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/JGitUtils.java | 1 |
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;
}
|