Stash local changes and reapply at the end

paulscherrerinstitute · Aug 5, 2022 · f9e9867 · f9e9867
1 parent 20c018c
commit f9e9867
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/deploy_dev.sh b/deploy_dev.sh
@@ -52,6 +52,14 @@ function gpr() {
   fi
 }
 
+function prepare_env_and_run() {
+  stash=$(git stash 2>&1)
+  gpr
+  if [ "$push" != "No local changes to save" ]; then
+    git stash apply || echo "Cannot stash apply. Manually resolve conflicts"
+  fi
+}
+
 function main() {
   module="${input_module:-scilog}"
   branch_parse=$(git --git-dir=$module/.git rev-parse --abbrev-ref HEAD)
@@ -61,7 +69,7 @@ function main() {
   if [ "$branch" == "main" ]; then
     branch="$short_commit"
   fi
-  gpr
+  prepare_env_and_run
 }
 
 main