pop the last stash off the stack if it exists

netfoundry · Jan 16, 2024 · d889adb · d889adb
1 parent b56acfd
commit d889adb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -42,7 +42,10 @@ if [ -n "$(git status --porcelain)" ]; then
   git stash
   git fetch "$INPUT_REMOTE" "$GITHUB_REF:actions-x-temp-branch"
   git switch actions-x-temp-branch
-  git stash pop
+  STASH_NAME=$(git stash list | awk -F: '/stash@/{print $1}')
+  if [ -n "$STASH_NAME" ]; then
+    git stash pop
+  fi
   git add $INPUT_FILES -v
   git commit -m "$INPUT_MESSAGE"
 else