Merge pull request open-telemetry#166 from MSNev/MSNev/AddComponents

fix: handle re-adding submodule to the index
opentelemetrybot · Aug 16, 2023 · ff8c194 · ff8c194
2 parents cc4ac29 + ed81e3e
commit ff8c194
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/sandbox-tools/merge-repos/src/mergeStagingToMain.ts b/sandbox-tools/merge-repos/src/mergeStagingToMain.ts
@@ -993,8 +993,14 @@ async function mergeStagingToMaster(mergeGit: SimpleGit, stagingDetails: IStagin
 
     log ("Resetting up submodules");
     for (let lp = 0; lp < _subModules.length; lp++) {
-        log ("adding submodule " + _subModules[lp].path + " => " + _subModules[lp].url);
-        await mergeGit.submoduleAdd(_subModules[lp].url, _subModules[lp].path);
+        try {
+            log ("adding submodule " + _subModules[lp].path + " => " + _subModules[lp].url);
+            await mergeGit.submoduleAdd(_subModules[lp].url, _subModules[lp].path);
+        } catch (e) {
+            if (e.message.indexOf("already exists") === -1) {
+                throw e;
+            }
+        }
     }
 
     // Update the root package json