diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-05-24 08:34:32 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-05-24 08:34:40 +0900 |
| commit | 76c867d62a0ff070035509838e26f87551aa890a (patch) | |
| tree | c6c72a30b03ebcc96047ea6d2227ab2dfc756d79 | |
| parent | 87c7bda9145296625a9dbd6c7c75c59033dd8f02 (diff) | |
| parent | 7eb222f20d34d026e3de9acad7275271de71f7eb (diff) | |
| download | jgit-76c867d62a0ff070035509838e26f87551aa890a.tar.gz jgit-76c867d62a0ff070035509838e26f87551aa890a.zip | |
Merge branch 'stable-5.4'
* stable-5.4:
SystemReader: Respect passed-in parent when no system config is present
Prepare 5.4.0-SNAPSHOT builds
JGit v5.4.0.201905221418-m3
Prepare 5.4.0-SNAPSHOT builds
JGit v5.4.0.201905081430-m2
Change-Id: If69cb0afe9915b926d977e4ad26c7d72db31667c
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -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 |