[DO NOT LAND] Testing squashing while landing with git-node

[trivikr]

commit for testing squashing with node-core-utils nodejs/node-core-utils#283

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• tests and/or benchmarks are included
• documentation is changed or added
• commit message follows commit guidelines

[nodejs-github-bot]

@trivikr build started: https://ci.nodejs.org/blue/organizations/jenkins/node-test-pull-request-lite-pipeline/detail/node-test-pull-request-lite-pipeline/1110/pipeline

[trivikr]

Outputs while trying to land:

$ git node land 23235

✔  Done loading data for nodejs/node/pull/23235
----------------------------------- PR info ------------------------------------
Title      [DO NOT LAND] Testing squashing while landing with git-node (#23235)
⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     trivikr:trivikr-patch-1 -> nodejs:master
Labels     doc
Commits    4
 - Testing squashing while landing with git-node
 - Another commit to add to the PR
 - One more commit!
 - Adding sample text
Committers 2
 - GitHub <noreply@github.com>
 - Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
✔  Requested Changes: 0
✖  Approvals: 0
✖  No CI runs detected
ℹ  This PR was created on Tue Oct 02 2018 (weekday in UTC)
⚠  47 hours left to land
--------------------------------------------------------------------------------
? This PR is not ready to land, do you want to continue? [Y/n] Y
✔  No git am in progress
✔  No git rebase in progress
--------------------------------------------------------------------------------
? Do you want to try reset the local master branch to upstream/master? [Y/n] Y
⠧ Bringing upstream/master up to date...From github.com:nodejs/node
 * branch                  master     -> FETCH_HEAD
✔  upstream/master is now up-to-date
✔  Downloaded patch to /home/trivikr/workspace/node/.ncu/23235/patch
--------------------------------------------------------------------------------
Applying: Testing squashing while landing with git-node
.git/rebase-apply/patch:13: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: Another commit to add to the PR
.git/rebase-apply/patch:13: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: One more commit!
.git/rebase-apply/patch:13: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Applying: Adding sample text
✔  Patches applied
There are 4 commits in the PR
Please run the following command to complete landing

$ git rebase upstream/master -i -x "git node land --amend"

$ git rebase upstream/master -i -x "git node land --amend"

Executing: git node land --amend
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

commit for testing squashing with node-core-utils https://github.com/nodejs/node-core-utils/issues/283

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
interactive rebase in progress; onto 37e8381150
Last commands done (2 commands done):
   pick 90d381469a Testing squashing while landing with git-node
   exec git node land --amend
Next commands to do (6 remaining commands):
   fixup b6bf7f3daf Another commit to add to the PR
   exec git node land --amend
You are currently editing a commit while rebasing branch 'master' on '37e8381150'.

No changes
You asked to amend the most recent commit, but doing so would make
it empty. You can repeat your command with --allow-empty, or you can
remove the commit entirely with "git reset HEAD^".
warning: execution failed: git node land --amend
You can fix the problem, and then run

  git rebase --continue

$ git rebase --continue

Executing: git node land --amend
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

commit for testing squashing with node-core-utils https://github.com/nodejs/node-core-utils/issues/283

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
[detached HEAD ad4220cde3] Testing squashing while landing with git-node
 Author: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
 Date: Tue Oct 2 22:30:06 2018 -0700
 1 file changed, 1 insertion(+)
Executing: git node land --amend
⚠  Found PR-URL: https://github.com/nodejs/node/pull/23235, skipping..
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

commit for testing squashing with node-core-utils https://github.com/nodejs/node-core-utils/issues/283

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
[detached HEAD 38de6289e4] Testing squashing while landing with git-node
 Author: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
 Date: Tue Oct 2 22:30:06 2018 -0700
 1 file changed, 2 insertions(+)
Executing: git node land --amend
⚠  Found PR-URL: https://github.com/nodejs/node/pull/23235, skipping..
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

commit for testing squashing with node-core-utils https://github.com/nodejs/node-core-utils/issues/283

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
[detached HEAD 9be43a85e0] Testing squashing while landing with git-node
 Author: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
 Date: Tue Oct 2 22:30:06 2018 -0700
 1 file changed, 3 insertions(+)
Successfully rebased and updated refs/heads/master.

$ git node land --final

  ✖  9be43a85e02d105dac07ed77c6e287162e25bacb
     ✔  0:0      skipping fixes-url                        fixes-url
     ✔  0:0      blank line after title                    line-after-title
     ✖  1:72     Line should be <= 72 columns.             line-length
     ✔  0:0      metadata is at end of message             metadata-end
     ✖  0:0      Commit must have at least 1 reviewer.     reviewers
     ✖  0:0      Missing subsystem.                        subsystem
     ✔  0:0      Title is formatted correctly.             title-format
     ✔  0:0      Title is <= 50 columns.                   title-length

The command git node land --final does catch the issues with the commit

[trivikr]

Reopening to experiment new commands

[trivikr]

There are no empty commits in new commits (so that git won't ask to run --allow-empty)

Output:

$ git node land 23235

✔  Done loading data for nodejs/node/pull/23235
----------------------------------- PR info ------------------------------------
Title      [DO NOT LAND] Testing squashing while landing with git-node (#23235)
⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     trivikr:trivikr-patch-1 -> nodejs:master
Labels     doc
Commits    2
 - Testing squashing while landing with git-node
 - Second commit to initiate squashing
Committers 1
 - Kamat, Trivikram <16024985+trivikr@users.noreply.github.com>
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
✔  Requested Changes: 0
✖  Approvals: 0
✖  No CI runs detected
ℹ  This PR was created on Tue Oct 02 2018 (weekday in UTC)
⚠  38 hours left to land
--------------------------------------------------------------------------------
? This PR is not ready to land, do you want to continue? [Y/n] Y
✔  No git am in progress
✔  No git rebase in progress
--------------------------------------------------------------------------------
? Do you want to try reset the local master branch to upstream/master? [Y/n] Y
⠼ Bringing upstream/master up to date...From github.com:nodejs/node
 * branch                  master     -> FETCH_HEAD
✔  upstream/master is now up-to-date
✔  Downloaded patch to /home/trivikr/workspace/node/.ncu/23235/patch
--------------------------------------------------------------------------------
Applying: Testing squashing while landing with git-node
Applying: Second commit to initiate squashing
✔  Patches applied
There are 2 commits in the PR
Please run the following command to complete landing

$ git rebase upstream/master -i -x "git node land --amend"

$ git rebase upstream/master -i -x "git node land --amend"

Executing: git node land --amend
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
[detached HEAD 80397e5562] Testing squashing while landing with git-node
 Date: Tue Oct 2 22:45:08 2018 -0700
 1 file changed, 2 insertions(+)
Executing: git node land --amend
⚠  Found PR-URL: https://github.com/nodejs/node/pull/23235, skipping..
--------------------------------- New Message ----------------------------------
Testing squashing while landing with git-node

PR-URL: https://github.com/nodejs/node/pull/23235
--------------------------------------------------------------------------------
? Use this message? [Y/n] Y
[detached HEAD c07d750e4b] Testing squashing while landing with git-node
 Date: Tue Oct 2 22:45:08 2018 -0700
 1 file changed, 3 insertions(+)
Successfully rebased and updated refs/heads/master.

The command git node land --final can be suggested after the execution of second command