mirror of https://github.com/nodejs/node.git
tools: remove last of error-masking in commit-queue.sh
Remove the lats of the unintentional error-masking in commit-queue.sh. With this change, `tools/lint-sh.js . --from-npx` at last passes. PR-URL: https://github.com/nodejs/node/pull/41356 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Tierney Cyren <hello@bnb.im> Reviewed-By: Zijian Liu <lxxyxzj@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>pull/41342/head
parent
9b637ca255
commit
5f07d00c60
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue