Merge pull request #378 from rest-for-physics/pull-submodules-bug

Addressing bug in pull-submodules
rest-for-physics · Feb 22, 2023 · 7440060 · 7440060
2 parents d50979e + b4efcb3
commit 7440060
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pull-submodules.py b/pull-submodules.py
@@ -233,7 +233,7 @@ def main():
     if force:
         print("Forcing reset: ", end="")
         p = subprocess.run(
-            f"git submodule foreach --recursive 'git reset --hard'",  #
+            f"git submodule foreach --recursive 'git reset --hard || true'",  #
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -259,7 +259,7 @@ def main():
     if latest:
         print("Pulling submodules: ", end="")
         p = subprocess.run(
-            f"git submodule foreach  --recursive 'git fetch; if [ -z \"$(git ls-remote --heads origin {frameworkBranchName})\" ]; then git checkout master; else git checkout {frameworkBranchName};fi;git pull'",  #
+            f"git submodule foreach  --recursive 'git fetch; if [ -z \"$(git ls-remote --heads origin {frameworkBranchName})\" ]; then git checkout master; else git checkout {frameworkBranchName};fi;git pull || true'",  #
             shell=True,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -282,7 +282,7 @@ def main():
             print("[\033[92m OK \x1b[0m]")
     # get commit id
     p = subprocess.run(
-        f"git submodule foreach  --recursive 'git rev-parse HEAD'",  #
+        f"git submodule foreach  --recursive 'git rev-parse HEAD || true'",  #
         shell=True,
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,