Reference the .gitmodules file to get a list of current submodules, r…

…ather than the .git/config file, which may have old submodules from other branches. JENKINS-37419
jenkinsci · Dec 5, 2016 · 28db63d · darxriggs · Jul 25, 2018 · MarkEWaite
1 parent 140e8f0
commit 28db63d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java b/src/main/java/org/jenkinsci/plugins/gitclient/CliGitAPIImpl.java
@@ -961,6 +961,10 @@ public SubmoduleUpdateCommand timeout(Integer timeout) {
              * @throws InterruptedException if called methods throw same exception
              */
             public void execute() throws GitException, InterruptedException {
+                // Initialize the submodules to ensure that the git config
+                // contains the URLs from .gitmodules.
+                submoduleInit();
+
                 ArgumentListBuilder args = new ArgumentListBuilder();
                 args.add("submodule", "update");
                 if (recursive) {
@@ -995,7 +999,7 @@ else if (!referencePath.isDirectory())
                 try {
                     // We might fail if we have no modules, so catch this
                     // exception and just return.
-                    cfgOutput = launchCommand("config", "--get-regexp", "^submodule");
+                    cfgOutput = launchCommand("config", "-f", ".gitmodules", "--get-regexp", "^submodule\\.(.*)\\.url");
                 } catch (GitException e) {
                     listener.error("No submodules found.");
                     return;