frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/sync-upstream.sh
View File

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