Browse Source

Merge branch 'stable-5.5'

* stable-5.5:
  Fix NPE in SystemReader in tests

Change-Id: I8500caeca99fe05ce9a80b54330b72e23670a46b
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
next
Thomas Wolf 5 years ago
parent
commit
ca8887a074
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

3
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

@ -428,9 +428,6 @@ public abstract class SystemReader {
updateAll(config.getBaseConfig());
if (config instanceof FileBasedConfig) {
FileBasedConfig cfg = (FileBasedConfig) config;
if (!cfg.getFile().exists()) {
return;
}
if (cfg.isOutdated()) {
LOG.debug("loading config {}", cfg); //$NON-NLS-1$
cfg.load();

Loading…
Cancel
Save