Browse Source

Merge branch 'stable-4.7' into stable-4.8

* stable-4.7:
  SubmoduleValidator: Permit missing path or url

Change-Id: I94fdaf45abbf7665f9eddc14b1a7f7144aafeadf
Signed-off-by: Jonathan Nieder <jrn@google.com>
stable-4.8
Jonathan Nieder 6 years ago
parent
commit
830e0d6b8c
  1. 27
      org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java

27
org.eclipse.jgit/src/org/eclipse/jgit/internal/submodule/SubmoduleValidator.java

@ -42,6 +42,10 @@
*/ */
package org.eclipse.jgit.internal.submodule; 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.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
@ -134,7 +138,6 @@ public class SubmoduleValidator {
*/ */
public static void assertValidSubmodulePath(String path) public static void assertValidSubmodulePath(String path)
throws SubmoduleValidationException { throws SubmoduleValidationException {
if (path.startsWith("-")) { //$NON-NLS-1$ if (path.startsWith("-")) { //$NON-NLS-1$
throw new SubmoduleValidationException( throw new SubmoduleValidationException(
MessageFormat.format( MessageFormat.format(
@ -154,19 +157,21 @@ public class SubmoduleValidator {
Config c = new Config(); Config c = new Config();
try { try {
c.fromText(gitModulesContents); c.fromText(gitModulesContents);
for (String subsection : c.getSubsections( for (String subsection :
ConfigConstants.CONFIG_SUBMODULE_SECTION)) { c.getSubsections(CONFIG_SUBMODULE_SECTION)) {
String url = c.getString(
ConfigConstants.CONFIG_SUBMODULE_SECTION,
subsection, ConfigConstants.CONFIG_KEY_URL);
assertValidSubmoduleUri(url);
assertValidSubmoduleName(subsection); assertValidSubmoduleName(subsection);
String url = c.getString(
CONFIG_SUBMODULE_SECTION, subsection, CONFIG_KEY_URL);
if (url != null) {
assertValidSubmoduleUri(url);
}
String path = c.getString( String path = c.getString(
ConfigConstants.CONFIG_SUBMODULE_SECTION, subsection, CONFIG_SUBMODULE_SECTION, subsection, CONFIG_KEY_PATH);
ConfigConstants.CONFIG_KEY_PATH); if (path != null) {
assertValidSubmodulePath(path); assertValidSubmodulePath(path);
}
} }
} catch (ConfigInvalidException e) { } catch (ConfigInvalidException e) {
throw new IOException( throw new IOException(

Loading…
Cancel
Save