diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-10-08 23:40:47 +0000 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-10-08 23:40:47 +0000 |
| commit | eb41de5b2534f07f1164bbb7ad1a19b225b55e7f (patch) | |
| tree | 64e4087acaf6a64879f39b7e2dbec6a454f3956f | |
| parent | 735f79c663f9ab4f5422a32a31512cc919f744f0 (diff) | |
| parent | 8b239e5b75fc4bb137b2845b607f5cc1bb4cc29b (diff) | |
| download | jgit-eb41de5b2534f07f1164bbb7ad1a19b225b55e7f.tar.gz jgit-eb41de5b2534f07f1164bbb7ad1a19b225b55e7f.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
SubmoduleValidator: Remove unused import of ConfigConstants
SubmoduleValidator: Permit missing path or url
Change-Id: Id74c837d6cb728439ccbd6ade71936b493c09e08
Signed-off-by: Jonathan Nieder <jrn@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java index d4bba2d0d1..3651631573 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java @@ -42,13 +42,16 @@ */ package org.eclipse.jgit.internal.submodule; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PATH; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_URL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_SUBMODULE_SECTION; + import java.io.IOException; import java.text.MessageFormat; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.ConfigConstants; /** * Validations for the git submodule fields (name, path, uri). @@ -134,7 +137,6 @@ public class SubmoduleValidator { */ public static void assertValidSubmodulePath(String path) throws SubmoduleValidationException { - if (path.startsWith("-")) { //$NON-NLS-1$ throw new SubmoduleValidationException( MessageFormat.format( @@ -154,19 +156,21 @@ public class SubmoduleValidator { Config c = new Config(); try { c.fromText(gitModulesContents); - for (String subsection : c.getSubsections( - ConfigConstants.CONFIG_SUBMODULE_SECTION)) { - String url = c.getString( - ConfigConstants.CONFIG_SUBMODULE_SECTION, - subsection, ConfigConstants.CONFIG_KEY_URL); - assertValidSubmoduleUri(url); - + for (String subsection : + c.getSubsections(CONFIG_SUBMODULE_SECTION)) { assertValidSubmoduleName(subsection); + String url = c.getString( + CONFIG_SUBMODULE_SECTION, subsection, CONFIG_KEY_URL); + if (url != null) { + assertValidSubmoduleUri(url); + } + String path = c.getString( - ConfigConstants.CONFIG_SUBMODULE_SECTION, subsection, - ConfigConstants.CONFIG_KEY_PATH); - assertValidSubmodulePath(path); + CONFIG_SUBMODULE_SECTION, subsection, CONFIG_KEY_PATH); + if (path != null) { + assertValidSubmodulePath(path); + } } } catch (ConfigInvalidException e) { throw new IOException( |