"git node land" hides co-authored-by trailers

The original commit message in nodejs/node#41490 was:

commit f042c61749a34565ab57b5ed5f7c89ab9e894494
Author: Tobias Nießen <tniessen@tnie.de>
Date:   Tue Jan 11 20:38:00 2022 +0000

    src: gracefully handle errors in GetX509NameObject

    Co-authored-by: Anna Henningsen <anna@addaleax.net>

However, git node land added metadata at the end without incorporating the Co-authored-by line:

commit 721cc6b5e2d6f4112b56ee5ead19ddaeb99ac7a6
Author: Tobias Nießen <tniessen@tnie.de>
Date:   Tue Jan 11 20:38:00 2022 +0000

    src: gracefully handle errors in GetX509NameObject

    Co-authored-by: Anna Henningsen <anna@addaleax.net>

    PR-URL: https://github.com/nodejs/node/pull/41490
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

GitHub does not recognize the Co-authored-by line since there is an empty line between that and the metadata lines at the end. I didn't know this and I only coincidentally noticed that GitHub did not display the correct commit authorship after pushed.

I have force-pushed the correct the commit message:

commit 4dd1f42df6ee34c1a5456862647092cb9686ec9a (HEAD -> master, upstream/master)
Author: Tobias Nießen <tniessen@tnie.de>
Date:   Tue Jan 11 20:38:00 2022 +0000

    src: gracefully handle errors in GetX509NameObject

    PR-URL: https://github.com/nodejs/node/pull/41490
    Co-authored-by: Anna Henningsen <anna@addaleax.net>
    Reviewed-By: Anna Henningsen <anna@addaleax.net>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

Both messages pass core-validate-commit.

Other examples:

rules: add co-authored-by-is-trailer

I've opened nodejs/core-validate-commit#93 to enable core-validate-commit to detect this problem.

Ideally, git node land should detect that there are trailers (not only Co-authored-by) and add its own trailers after them without the additional new line.

With nodejs/core-validate-commit#93, git node land at least doesn't do that silently anymore:

--------------------------------- New Message ----------------------------------
doc: do not reference SSL when discussing SNI

Co-authored-by: Rich Trott <rtrott@gmail.com>

PR-URL: https://github.com/nodejs/node/pull/41549
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
--------------------------------------------------------------------------------
? Use this message? (Y/n)
? Use this message? Yes
[master 5a74c82f3d4] doc: do not reference SSL when discussing SNI
 Date: Sun Jan 16 04:51:23 2022 +0100
 1 file changed, 1 insertion(+), 1 deletion(-)
  ✖  5a74c82f3d48f08925534eb148009e5bd1e2733e
     ✖  1:0      Co-authored-by must be a trailer          co-authored-by-is-trailer
     ✔  0:0      skipping fixes-url                        fixes-url
     ✔  0:0      blank line after title                    line-after-title
     ✔  0:0      line-lengths are valid                    line-length
     ✔  0:0      metadata is at end of message             metadata-end
     ✔  3:8      PR-URL is valid.                          pr-url
     ✔  0:0      reviewers are valid                       reviewers
     ✔  0:0      valid subsystems                          subsystem
     ✔  0:0      Title is formatted correctly.             title-format
     ✔  0:0      Title is <= 50 columns.                   title-length
--------------------------------------------------------------------------------
? The commit did not pass the validation. Do you still want to land it? (y/N)

@nodejs/collaborators If you use git node land locally, please update its dependencies to have at least https://github.com/nodejs/core-validate-commit/tree/v3.14.0.

(Sorry about the notification!)

ci: respect existing trailers in commit messages

fix: respect existing trailers in commit messages

fix: respect existing trailers in commit messages (#632)

Navigation Menu

"git node land" hides co-authored-by trailers #602

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

"git node land" hides co-authored-by trailers #602

Description

Activity

tniessen commented on Jan 14, 2022

targos commented on Jan 18, 2022

tniessen commented on Jan 18, 2022

tniessen commented on Jan 18, 2022

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions