diff options
| author | Matthias Sohn | 2019-10-07 17:06:33 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2019-10-07 17:15:13 +0000 |
| commit | 756b57d04ae946338c129ae5cb87b4975d189446 (patch) | |
| tree | 2c53c909041d94e483f13ebfa5f938205d590b4f | |
| parent | c5f96f90b006c10af96f50ce69fa50a3b153715e (diff) | |
| download | egit-stable-5.5.tar.gz egit-stable-5.5.tar.xz egit-stable-5.5.zip | |
Adapt EclipseSystemReader to the new ~/.jgitconfig introduced in jgitstable-5.5
Bug: 551850
JGit-Dependency: I0022bd40ae62f82e5b964c2ea25822eb55d94687
Change-Id: Id7ced60d2e5801e5ccb496f0b9154fb64970e21a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java index 6805c47954..938f3665de 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java @@ -1091,6 +1091,11 @@ public class Activator extends Plugin implements DebugOptionsListener { } @Override + public FileBasedConfig openJGitConfig(Config parent, FS fs) { + return delegate.openJGitConfig(parent, fs); + } + + @Override public FileBasedConfig openSystemConfig(Config parent, FS fs) { return delegate.openSystemConfig(parent, fs); } @@ -1112,6 +1117,12 @@ public class Activator extends Plugin implements DebugOptionsListener { } @Override + public StoredConfig getJGitConfig() + throws IOException, ConfigInvalidException { + return delegate.getJGitConfig(); + } + + @Override public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException { return delegate.getSystemConfig(); |