diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2017-08-29 10:25:05 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-09-04 09:19:03 +0200 |
| commit | 6d27869659e1a3436438ddbb18114f7c8dab6aed (patch) | |
| tree | 6e4cb72eb0d7dc1e94021c7850ea51a63a2f2ba2 /org.eclipse.jgit | |
| parent | 06ea633c1837e48934be62714ff40be149887301 (diff) | |
| download | jgit-6d27869659e1a3436438ddbb18114f7c8dab6aed.tar.gz jgit-6d27869659e1a3436438ddbb18114f7c8dab6aed.zip | |
Use Config.getEnum() to read the IgnoreSubmoduleMode
Doing so goes through the TypedConfigGetter and thus allows library
clients (for instance EGit) to warn about invalid configurations.
Change-Id: If1080ad90b8aff54a903d4d75637614faad6469b
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java index 7244c85c76..56784f7a76 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java @@ -45,7 +45,6 @@ package org.eclipse.jgit.submodule; import java.io.File; import java.io.IOException; import java.text.MessageFormat; -import java.util.Locale; import java.util.HashMap; import java.util.Map; @@ -691,13 +690,9 @@ public class SubmoduleWalk implements AutoCloseable { public IgnoreSubmoduleMode getModulesIgnore() throws IOException, ConfigInvalidException { lazyLoadModulesConfig(); - String name = modulesConfig.getString( + return modulesConfig.getEnum(IgnoreSubmoduleMode.values(), ConfigConstants.CONFIG_SUBMODULE_SECTION, getModuleName(path), - ConfigConstants.CONFIG_KEY_IGNORE); - if (name == null) - return null; - return IgnoreSubmoduleMode - .valueOf(name.trim().toUpperCase(Locale.ROOT)); + ConfigConstants.CONFIG_KEY_IGNORE, IgnoreSubmoduleMode.NONE); } /** |