sync-upstream: Use --autostash to handle uncommitted changes

This makes it possible to use sync-upstream with uncommitted changes. (This
is in particular helpful when working on the script itself.)

Without this commit, git pull will fail due to the uncommitted changes.
This commit is contained in:
Tim Ruffing 2023-04-11 12:21:14 +02:00
parent 1d25608900
commit 13c438cdee

View File

@ -97,7 +97,7 @@ echo "$BODY"
echo "-----------------------------------"
# Create branch from PR commit and create PR
git checkout master
git pull
git pull --autostash
git checkout -b temp-merge-"$PRNUM"
# Escape single quote