Browse Source

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>
stable-5.5
David Pursehouse 5 years ago
parent
commit
76c867d62a
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

2
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

Loading…
Cancel
Save