diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-08-22 19:23:55 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-08-22 19:23:55 +0900 |
| commit | c2a5b7fdcfaeb41dbf5c5e25d0813240b3a8715c (patch) | |
| tree | 3df40a46d41b4c90bda89b29a0a2eda23e40b9bc /org.eclipse.jgit/src/org/eclipse | |
| parent | bbf3da1aac3742ec9fc606af5d4800944c19c0f5 (diff) | |
| download | jgit-c2a5b7fdcfaeb41dbf5c5e25d0813240b3a8715c.tar.gz jgit-c2a5b7fdcfaeb41dbf5c5e25d0813240b3a8715c.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -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 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 |