Skip to content

Conversation

@glehmann
Copy link
Contributor

@glehmann glehmann commented Apr 5, 2025

for DCO Sign Off and Gerrit Change Id

this is based on #6088

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

@glehmann glehmann requested a review from a team as a code owner April 5, 2025 14:12
@glehmann glehmann changed the title templates: add common trailer templates templates: add commonly used trailers Apr 5, 2025
@glehmann glehmann force-pushed the glehmann/xlutzwvxsvlm branch 12 times, most recently from d554b04 to 90d01d3 Compare April 12, 2025 17:24
@glehmann glehmann force-pushed the glehmann/xlutzwvxsvlm branch 5 times, most recently from 03d9d47 to 0f3f804 Compare April 13, 2025 20:53
@glehmann glehmann force-pushed the glehmann/xlutzwvxsvlm branch from 0f3f804 to e605e13 Compare April 14, 2025 17:34
@glehmann glehmann requested a review from yuja April 14, 2025 20:25
namely Signed-off-by and Change-Id

`format_signed_off_by_trailer` will be formatted properly if the author
name is not set, but will contain the email placeholder if the author
email is not set, as I haven't found a way to make the template
generation fail.

`format_gerrit_change_id_trailer` is based on jj's change id, but it
needed to be padded to reach 40 characters. Zero-padding is kind of
boring so I've used `6a6a6964`, the hexadecimal representation of `jjid`
in ascii.

Because the trailer value runs up to the end of the line, they are
all terminated with a new line. This way it's also convenient to
define these trailers in the `commit_trailers` template:

  [templates]
  commit_trailers = '''
    format_signed_off_by_trailer(self)
    ++ format_gerrit_change_id_trailer(self)
  '''
@glehmann glehmann force-pushed the glehmann/xlutzwvxsvlm branch from e605e13 to d9f17cf Compare April 15, 2025 05:15
@glehmann glehmann added this pull request to the merge queue Apr 15, 2025
@glehmann
Copy link
Contributor Author

@yuja Thank you for your comprehensive and kind reviews 👍

Merged via the queue into jj-vcs:main with commit f6e3f38 Apr 15, 2025
28 checks passed
@glehmann glehmann deleted the glehmann/xlutzwvxsvlm branch April 15, 2025 05:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants