[openssl/tools] 26af9a: gitaddrev: Produce compliant git trailers

  Branch: refs/heads/master
  Home:   https://github.com/openssl/tools
  Commit: 26af9a646af56a9c8b35f8398fa61b24dec72bd3
      https://github.com/openssl/tools/commit/26af9a646af56a9c8b35f8398fa61b24dec72bd3
  Author: Richard Levitte <[email protected]>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M review-tools/gitaddrev

  Log Message:
  -----------
  gitaddrev: Produce compliant git trailers

gitaddrev rewrote the commit message tail by hand, and wrote these
non-compliant trailers:

- it added an empty line before its trailers even when the message
  already ended with a trailer block, splitting it in two
- it ended the message with a non-trailer '(Merged from ...)' line

The result was that 'git interpret-trailers --parse' as well as other
applications could not see any of the trailers gitaddrev added, and
depending on the message, not the pre-existing ones either.

Instead of re-inventing trailer handling, pass the message through
'git interpret-trailers', feeding it the new trailers with --trailer
options.  This merges them into an existing trailer block, or adds
a separating blank line when the message doesn't end with trailers.
The option --if-exists addIfDifferent replaces the manual dedup of
reviewers already present in the message.

The '(Merged from ...)' line is replaced with a proper 'Merged-from:'
trailer, and 'MergeDate:' becomes 'Merge-date:', following the
sentence-cased, hyphen-separated naming convention used by
git-interpret-trailers(1) and common practice ('Signed-off-by',
'Reviewed-by', ...).  Existing 'MergeDate:' lines in old messages are
still recognised and suppress adding a new date.

Fixes: https://github.com/openssl/tools/issues/245
Assisted-by: Pi:moonshotai/kimi-k3
Signed-off-by: Richard Levitte <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Merge-date: Tue Aug 11 17:49:39 2026
Merged-from: https://github.com/openssl/tools/pull/246


  Commit: 40316353777e9a94b65a0298853e62d70770b23d
      https://github.com/openssl/tools/commit/40316353777e9a94b65a0298853e62d70770b23d
  Author: Richard Levitte <[email protected]>
  Date:   2026-08-11 (Tue, 11 Aug 2026)

  Changed paths:
    M review-tools/cherry-checker

  Log Message:
  -----------
  cherry-checker: Recognise the Merged-from: trailer

Since gitaddrev now records the pull request reference as a proper
'Merged-from:' trailer instead of the old non-trailer '(Merged from'
line, cherry-checker's pull request number detection needs to be
modified accordingly.  It's made to match both forms.

Additionally, it's made to resolve the pull request number from
whichever alternative matched rather than by fixed group number, so
the alternatives can evolve independently.

Assisted-by: Pi:moonshotai/kimi-k3
Signed-off-by: Richard Levitte <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Merge-date: Tue Aug 11 17:49:41 2026
Merged-from: https://github.com/openssl/tools/pull/246


Compare: https://github.com/openssl/tools/compare/f7ba4745aa3f...40316353777e

To unsubscribe from these emails, change your notification settings at https://github.com/openssl/tools/settings/notifications

-- 
You received this message because you are subscribed to the Google Groups "openssl-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/a/openssl.org/d/msgid/openssl-commits/openssl/tools/push/refs/heads/master/f7ba47-403163%40github.com.