diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2015-05-19 11:30:03 +0200 |
|---|---|---|
| committer | Sebastian Schuberth <sschuberth@gmail.com> | 2015-05-22 09:37:34 +0200 |
| commit | d9ffc03837e1c4ed39e3d9ebb12e05fb9e45be82 (patch) | |
| tree | 93e6b8e47130d3a8320ccab204644af658650a75 /org.eclipse.jgit/src/org/eclipse/jgit/util | |
| parent | cb12f4f0ad71a688859980b7bc11d277b80fd591 (diff) | |
| download | jgit-d9ffc03837e1c4ed39e3d9ebb12e05fb9e45be82.tar.gz jgit-d9ffc03837e1c4ed39e3d9ebb12e05fb9e45be82.zip | |
SystemReader: Use discoverGitSystemConfig() in openSystemConfig()
Bug: 410568
Change-Id: Id768294e83f374f50ae5e6486f4e757515c8262d
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/util')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index f6f415e85b..04a7051a72 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -89,8 +89,8 @@ public abstract class SystemReader { } public FileBasedConfig openSystemConfig(Config parent, FS fs) { - File prefix = fs.gitPrefix(); - if (prefix == null) { + File configFile = fs.discoverGitSystemConfig(); + if (configFile == null) { return new FileBasedConfig(null, fs) { public void load() { // empty, do not load @@ -102,9 +102,7 @@ public abstract class SystemReader { } }; } - File etc = fs.resolve(prefix, "etc"); //$NON-NLS-1$ - File config = fs.resolve(etc, "gitconfig"); //$NON-NLS-1$ - return new FileBasedConfig(parent, config, fs); + return new FileBasedConfig(parent, configFile, fs); } public FileBasedConfig openUserConfig(Config parent, FS fs) { |