yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'merge-after-ci: unstash only if stashed' (#2062) from DavHau/clan-core:DavHau-dave into main

Browse Source
This commit is contained in:
clan-bot
2024-09-09 20:10:42 +00:00
parent bb81c7b3ff 59e78e0560
commit 33f98aba05
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tea-create-pr/script.sh
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
set -x
remoteFork="${1:-origin}" remoteFork="${1:-origin}"
remoteUpstream="${2:-upstream}" remoteUpstream="${2:-upstream}"
@@ -32,12 +33,21 @@ fi
# run formatting on a clean working tree # run formatting on a clean working tree
echo "stashing uncommitted changes to run treefmt" echo "stashing uncommitted changes to run treefmt"
git stash push if ! git diff --quiet --cached --exit-code || ! git diff --quiet --exit-code; then
git stash push
pop() {
git stash pop
}
else
pop() {
:
}
fi
if ! treefmt --fail-on-change --no-cache; then if ! treefmt --fail-on-change --no-cache; then
git stash pop pop
exit 1 exit 1
fi fi
git stash pop pop
upstream_url=$(git remote get-url "$remoteUpstream") upstream_url=$(git remote get-url "$remoteUpstream")
set -x set -x