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>

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

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