From: David Pursehouse <david.pursehouse@gmail.com>
Date: Thu, 22 Aug 2019 10:23:55 +0000 (+0900)
Subject: SystemReader: Use correct constructor of FileBasedConfig
X-Git-Tag: v5.3.4.201908231101-r~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c2a5b7fdcfaeb41dbf5c5e25d0813240b3a8715c;p=jgit.git

SystemReader: Use correct constructor of FileBasedConfig

The merge done in change If0c5010a2 resolved a conflict incorrectly
and reverted the fix that was done in change Id0bcdc93b.

Change-Id: I0f5fde33d1f366817f2b966eb42535f7bd3b063e
Reported-by: Thomas Wolf <thomas.wolf@paranor.ch>
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---

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 d554562a75..0f8c248f9c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java
@@ -126,7 +126,7 @@ public abstract class SystemReader {
 					return new FileBasedConfig(parent, configFile, fs);
 				}
 			}
-			return new FileBasedConfig(null, fs) {
+			return new FileBasedConfig(parent, null, fs) {
 				@Override
 				public void load() {
 					// empty, do not load