From fe709c1d4b5696729d66ea224f0c3494d2a0e98c Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 11 Jan 2023 16:21:11 +0100 Subject: [PATCH] github-merge-pr: add check for working on clean branch With error it may happen to work on a dirty branch and unintended changes may be merged on merging a different pull request. Add a check for it and exit with an error text. Signed-off-by: Christian Marangi --- github-merge-pr.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/github-merge-pr.sh b/github-merge-pr.sh index f8758d3..f7325db 100755 --- a/github-merge-pr.sh +++ b/github-merge-pr.sh @@ -107,6 +107,11 @@ fi echo "Returning to $BRANCH" $GIT checkout $BRANCH +if [ -n "$($GIT log origin/$BRANCH..HEAD)" ]; then + echo "Working on dirty branch for $BRANCH! Please reset $BRANCH to origin/$BRANCH" >&2 + exit 10 +fi + echo "Actually merging the PR #$PRID from branch $PR_USER/$PR_BRANCH" if ! $GIT merge --ff-only $PR_USER/$PR_BRANCH; then echo "Failed to merge $PR_USER/$PR_BRANCH on $BRANCH" >&2 -- 2.30.2