We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent afe3f73 commit 0b64245Copy full SHA for 0b64245
github/github_pull_request_create.sh
@@ -179,9 +179,12 @@ if [ "$total_commits" -gt 0 ]; then
179
fi
180
if [ "$GITHUB_PULL_REQUEST_AUTO_MERGE" = true ]; then
181
pr_url="$(get_pr_url)"
182
- # do not quote as supplying unexpected empty args would likely break command
183
- # shellcheck disable=SC2086
184
- gh pr merge "$pr_url" --auto ${GITHUB_PULL_REQUEST_SQUASH:+--squash} ${GITHUB_PULL_REQUEST_SQUASH:---merge}
+ # not supporting Rebase on purpose - see https://medium.com/@harisekhon/the-evils-of-git-rebasing-beec34a607c7
+ merge_type="--merge"
+ if [ "${GITHUB_PULL_REQUEST_SQUASH:-}" = true ]; then
185
+ merge_type="--squash"
186
+ fi
187
+ gh pr merge "$pr_url" --auto "$merge_type"
188
189
echo >&2
190
else
0 commit comments