tools: do not use temp files when merging PRs

[aduh95]

IIRC the script was written like this so it could work even without set -xe while maintaining a verbose enough output to allow debugging. However, with set -e, it's kind of an unnecessary step, and it's a bit annoying to have those temp files popping up when running the scripts.

[nodejs-github-bot]

Review requested:

• @nodejs/actions

[nodejs-github-bot]

Commit Queue failed

- Loading data for nodejs/node/pull/57790
✔  Done loading data for nodejs/node/pull/57790
----------------------------------- PR info ------------------------------------
Title      tools: do not use temp files when merging PRs (#57790)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     aduh95:merge.sh-tmp-files -> nodejs:main
Labels     tools, author ready
Commits    2
 - tools: do not use temp files when merging PRs
 - Apply suggestions from code review
Committers 2
 - Antoine du Hamel <[email protected]>
 - GitHub <[email protected]>
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
--------------------------------------------------------------------------------
   ℹ  This PR was created on Tue, 08 Apr 2025 11:37:11 GMT
   ✔  Approvals: 2
   ✔  - LiviaMedeiros (@LiviaMedeiros): https://github.com/nodejs/node/pull/57790#pullrequestreview-2751143697
   ✔  - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/57790#pullrequestreview-2757710837
   ✔  Last GitHub CI successful
   ℹ  Green GitHub CI is sufficient
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/main up to date...
From https://github.com/nodejs/node
 * branch                  main       -> FETCH_HEAD
✔  origin/main is now up-to-date
- Downloading patch for 57790
From https://github.com/nodejs/node
 * branch                  refs/pull/57790/merge -> FETCH_HEAD
✔  Fetched commits as f692878dec63..a1779ce5aa2d
--------------------------------------------------------------------------------
[main f84b17bb86] tools: do not use temp files when merging PRs
 Author: Antoine du Hamel <[email protected]>
 Date: Tue Apr 8 00:18:57 2025 +0200
 2 files changed, 16 insertions(+), 30 deletions(-)
[main a33199c1c8] Apply suggestions from code review
 Author: Antoine du Hamel <[email protected]>
 Date: Tue Apr 8 16:37:39 2025 +0200
 2 files changed, 2 insertions(+), 2 deletions(-)
   ✔  Patches applied
There are 2 commits in the PR. Attempting autorebase.
Rebasing (2/4)
Executing: git node land --amend --yes
--------------------------------- New Message ----------------------------------
tools: do not use temp files when merging PRs
PR-URL: #57790

Reviewed-By: LiviaMedeiros <[email protected]>

Reviewed-By: Luigi Pinca <[email protected]>
[detached HEAD fcf56ed002] tools: do not use temp files when merging PRs

Author: Antoine du Hamel <[email protected]>

Date: Tue Apr 8 00:18:57 2025 +0200

2 files changed, 16 insertions(+), 30 deletions(-)

Rebasing (3/4)

Rebasing (4/4)

Executing: git node land --amend --yes

--------------------------------- New Message ----------------------------------

Apply suggestions from code review
Co-authored-by: Livia Medeiros <[email protected]>

PR-URL: #57790

Reviewed-By: LiviaMedeiros <[email protected]>

Reviewed-By: Luigi Pinca <[email protected]>
[detached HEAD cc77361292] Apply suggestions from code review

Author: Antoine du Hamel <[email protected]>

Date: Tue Apr 8 16:37:39 2025 +0200

2 files changed, 2 insertions(+), 2 deletions(-)

Successfully rebased and updated refs/heads/main.
ℹ  Add commit-queue-squash label to land the PR as one commit, or commit-queue-rebase to land as separate commits.

https://github.com/nodejs/node/actions/runs/14390757413

[nodejs-github-bot]

Landed in d5b3dbb