diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh index bf6e06173c8138..16fbc7f2ef15fb 100755 --- a/tools/actions/commit-queue.sh +++ b/tools/actions/commit-queue.sh @@ -83,10 +83,14 @@ for pr in "$@"; do else # If there's only one commit, we can use the Squash and Merge feature from GitHub. # TODO: use `gh pr merge` when the GitHub CLI allows to customize the commit title (https://github.com/cli/cli/issues/1023). + commit_title=$(git log -1 --pretty='format:%s') + commit_body=$(git log -1 --pretty='format:%b') + commit_head=$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse) + jq -n \ - --arg title "$(git log -1 --pretty='format:%s')" \ - --arg body "$(git log -1 --pretty='format:%b')" \ - --arg head "$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)" \ + --arg title "${commit_title}" \ + --arg body "${commit_body}" \ + --arg head "${commit_head}" \ '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json cat output.json if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then