build: use autorebase option for git node land

This will allow to land commits with multiple commits and also properly
handle proper `fixup` commits.

Refs: https://github.com/nodejs/node-core-utils/pull/473

PR-URL: https://github.com/nodejs/node/pull/34969
Reviewed-By: Mary Marchini <oss@mmarchini.me>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
This commit is contained in:
Denys Otrishko authored and Mary Marchini committed 2020-08-31 14:22:03 -07:00
1 parent 6199678d67
commit 75d943ed4a
2 files changed
+5 -2

No files matched your search

+1 -1
View File
@@ -55,7 +55,7 @@ for pr in "$@"; do
# Delete the commit queue label
gitHubCurl "$(labelsUrl "$pr")"/"$COMMIT_QUEUE_LABEL" DELETE
git node land --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}"
git node land --autorebase --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}"
# cat here otherwise we'll be supressing the output of git node land
cat output