Fix enum parsing from Config files

Change-Id: Ib0b86ceab070d46903de7b55f2fd441714855141

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
index 983603623788011277fbb67afe9eca81fa8fa1eb..72f40d7e441665036e28ea0dea99bb61b88b9273 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
@@ -290,6 +290,9 @@ public class ConfigTest {
 
                c = parse("[s \"b\"]\n\tc = one-two\n");
                assertSame(TestEnum.ONE_TWO, c.getEnum("s", "b", "c", TestEnum.ONE_TWO));
+
+               c = parse("[s \"b\"]\n\tc = one two\n");
+               assertSame(TestEnum.ONE_TWO, c.getEnum("s", "b", "c", TestEnum.ONE_TWO));
        }
 
        @Test

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
index fb78d0effff910b1f2fbac350609854b1f36d126..62cfedde6684d9b0be4418d74d39063d1dc76c19 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
@@ -387,7 +387,7 @@ public class Config {
                if (value == null)
                        return defaultValue;
 
-               String n = value.replace('-', '_');
+               String n = value.replace('-', '_').replace(' ', '_');
                T trueState = null;
                T falseState = null;
                for (T e : all) {