diff options
| author | Dave Borowitz <dborowitz@google.com> | 2019-05-23 13:56:00 -0700 |
|---|---|---|
| committer | Dave Borowitz <dborowitz@google.com> | 2019-05-23 16:07:49 -0700 |
| commit | 04bd5821e9ebc9b985c99e991cdb092a7fc03c43 (patch) | |
| tree | 1fb55695a095002b0766476186634907358350e7 /org.eclipse.jgit/src/org | |
| parent | 1342942cc87d0039e635274a416aa219aaf975ad (diff) | |
| download | jgit-04bd5821e9ebc9b985c99e991cdb092a7fc03c43.tar.gz jgit-04bd5821e9ebc9b985c99e991cdb092a7fc03c43.zip | |
SystemReader: Respect passed-in parent when no system config is present
The default implementation of openSystemConfig has special handling for
when the FS returns null from getGitSystemConfig: it should return a
"real" FileBasedConfig instance that never actually tries to load a
file. However, this codepath was not respecting the passed-in parent
config.
Change-Id: Id0bcdc93bb42f9ebe3f5ee4c6b4be8863e0133f9
Diffstat (limited to 'org.eclipse.jgit/src/org')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 2 |
1 files changed, 1 insertions, 1 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 953c9768f9..7497750a80 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -101,7 +101,7 @@ public abstract class SystemReader { public FileBasedConfig openSystemConfig(Config parent, FS fs) { File configFile = fs.getGitSystemConfig(); if (configFile == null) { - return new FileBasedConfig(null, fs) { + return new FileBasedConfig(parent, null, fs) { @Override public void load() { // empty, do not load |