Add merge-pr.sh script

This commit is contained in:
Oskar Thoren 2017-12-05 19:04:45 +01:00
parent addaeba706
commit a68f065237
No known key found for this signature in database
GPG Key ID: 5128AB0637CD85AF
1 changed files with 34 additions and 0 deletions

34
scripts/merge-pr.sh Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/env sh
set -eof pipefail
BRANCH=$1
if [[ $# -eq 0 ]] ; then
echo 'Branch required as first argument'
exit 0
fi
echo "[Merge PR from ${BRANCH}]"
echo "[Update remote and checkout branch]"
git remote update origin
git checkout -B $BRANCH origin/$BRANCH && git pull
echo "[Rebase and squash to one commit (manual)]"
git rebase -i origin/develop
echo "[Verify signature and commit (manual), update PR]"
git show --show-signature
git push -f
echo "[Checkout develop and merge with same SHA]"
git checkout develop && git pull
git merge --ff-only $BRANCH
echo "[Push to protected develop branch]"
git push
echo "[Clean up remote branch]"
git push origin --delete $BRANCH
echo "[Done]"