diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-05-24 08:33:41 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-05-24 08:33:45 +0900 |
| commit | 7eb222f20d34d026e3de9acad7275271de71f7eb (patch) | |
| tree | 92a84995339e535738288f21dcf1394b8cdc51b5 /org.eclipse.jgit | |
| parent | 0988276746d4d173493b481639cb2545261240b1 (diff) | |
| parent | 04bd5821e9ebc9b985c99e991cdb092a7fc03c43 (diff) | |
| download | jgit-7eb222f20d34d026e3de9acad7275271de71f7eb.tar.gz jgit-7eb222f20d34d026e3de9acad7275271de71f7eb.zip | |
Merge branch 'stable-5.3' into stable-5.4
* stable-5.3:
SystemReader: Respect passed-in parent when no system config is present
Change-Id: I758ed0c2a3527ffcf6255158a49090aba090e942
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit')
| -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 5feacffdb3..d04f087d58 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 |