summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2014-10-14 17:51:53 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2014-10-14 17:51:53 +0200
commit5c85d5d58adbe415c217e45aa365892f2ca9fd0c (patch)
treed74b740b6aaed7fbef47231d9df75af0339b9de4 /org.eclipse.jgit
parent13ffda0666cec94183529307eecbbda3bcf12fb1 (diff)
parentdcb52291a9f1feacf666e592af64cb688ee4bc50 (diff)
downloadjgit-5c85d5d58adbe415c217e45aa365892f2ca9fd0c.tar.gz
jgit-5c85d5d58adbe415c217e45aa365892f2ca9fd0c.zip
Merge branch 'stable-3.5'
* stable-3.5: Prepare 3.5.2-SNAPSHOT builds JGit v3.5.1.201410131835-r Only hide gitdir if the repository isn't bare Change-Id: I171e5fb8718cb6829bb1357859c95b4a29910ac6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
index 447e357d5a..9670bf10a2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java
@@ -273,7 +273,7 @@ public class FileRepository extends Repository {
ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_HIDEDOTFILES,
HideDotFiles.DOTGITONLY);
- if (hideDotFiles != HideDotFiles.FALSE)
+ if (hideDotFiles != HideDotFiles.FALSE && !isBare())
getFS().setHidden(getDirectory(), true);
refs.create();
objectDatabase.create();