From 13c438cdeed358a20b1f0324ee36a6cadfaf0016 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Tue, 11 Apr 2023 12:21:14 +0200 Subject: [PATCH] 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. --- contrib/sync-upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index f4ccc449..c64acbbd 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -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