motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
David Pursehouse 2019-05-24 08:33:41 +09:00
parent 0988276746 04bd5821e9
commit 7eb222f20d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java
View File

@ -101,7 +101,7 @@ public String getProperty(String key) {
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