diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index f4ccc4491..3fb4a1454 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -eou pipefail +set -xeou pipefail help() { echo "$0 range [end]" @@ -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