Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update git mailmap #2921

Merged
merged 1 commit into from
Apr 2, 2024
Merged

Update git mailmap #2921

merged 1 commit into from
Apr 2, 2024

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Mar 28, 2024

This allows git to map multiple addresses correctly to a single name, which is useful in properly identifying the various authors. Some entries may look redundant, but they assign a proper (single) name where people have used multiple names with the same email address. For example, one with diacritics and one without.

Please cherry-pick my commits into:

  • Foreman 3.10/Katello 4.12
  • Foreman 3.9/Katello 4.11 (planned Satellite 6.15)
  • Foreman 3.8/Katello 4.10
  • Foreman 3.7/Katello 4.9 (Satellite 6.14)
  • Foreman 3.6/Katello 4.8
  • Foreman 3.5/Katello 4.7 (Satellite 6.13; orcharhino 6.6/6.7)
  • Foreman 3.4/Katello 4.6 (EL8 only)
  • Foreman 3.3/Katello 4.5 on EL7 & EL8 (Satellite 6.12 on EL8 only; orcharhino 6.4/6.5 on EL8 only)
  • We do not accept PRs for Foreman older than 3.3.

This allows git to map multiple addresses correctly to a single name,
which is useful in properly identifying the various authors. Some
entries may look redundant, but they assign a proper (single) name where
people have used multiple names with the same email address. For
example, one with diacritics and one without.
Copy link

github-actions bot commented Mar 28, 2024

The PR preview for f5cd0b8 is available at theforeman-foreman-documentation-preview-pr-2921.surge.sh

The following output files are affected by this PR:

show diff

show diff as HTML

Copy link
Contributor

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM, but the consequences/benefits are a bit unclear to me. Does this help with the release automation?

Feel free to adjust the commit message and merge.

@ekohl
Copy link
Member Author

ekohl commented Mar 28, 2024

diff LGTM, but the consequences/benefits are a bit unclear to me. Does this help with the release automation?

It makes git log better. #2915 was the main motivation. I'll add notes in there that I sent to @apinnick, without copying the results.

@ekohl ekohl mentioned this pull request Mar 28, 2024
9 tasks
Copy link
Contributor

@maximiliankolb maximiliankolb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also read https://git-scm.com/docs/gitmailmap#_description which explains this some more. Feel free to merge.

@ekohl ekohl merged commit 32011b5 into theforeman:master Apr 2, 2024
7 of 8 checks passed
@ekohl ekohl deleted the update-mailmap branch April 2, 2024 10:34
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