diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 78fe6065a..4a4969841 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -110,7 +110,7 @@ public class Repository { private final FileBasedConfig userConfig; - private final FileBasedConfig config; + private final FileBasedConfig repoConfig; private final RefDatabase refs; @@ -244,10 +244,10 @@ public Repository(final File d, final File workTree, final File objectDir, this.fs = fs; userConfig = SystemReader.getInstance().openUserConfig(fs); - config = new FileBasedConfig(userConfig, fs.resolve(gitDir, "config")); + repoConfig = new FileBasedConfig(userConfig, fs.resolve(gitDir, "config")); loadUserConfig(); - loadConfig(); + loadRepoConfig(); if (workDir == null) { // if the working directory was not provided explicitly, @@ -317,9 +317,9 @@ private void loadUserConfig() throws IOException { } } - private void loadConfig() throws IOException { + private void loadRepoConfig() throws IOException { try { - config.load(); + repoConfig.load(); } catch (ConfigInvalidException e1) { IOException e2 = new IOException(JGitText.get().unknownRepositoryFormat); e2.initCause(e1); @@ -417,14 +417,14 @@ public FileBasedConfig getConfig() { throw new RuntimeException(e); } } - if (config.isOutdated()) { + if (repoConfig.isOutdated()) { try { - loadConfig(); + loadRepoConfig(); } catch (IOException e) { throw new RuntimeException(e); } } - return config; + return repoConfig; } /**