Wiki

User Tools

  • Logged in as: anonymous (anonymous)
  • Log Out

Site Tools

Trace:
mantisbt:mailmap

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
mantisbt:mailmap [2019/08/08 19:24] – [Updating .mailmap] fix link to ref section dregadmantisbt:mailmap [2025/12/15 07:52] (current) – Identifying duplicates is done by update-credits.sh dregad
Line 1: Line 1:
 ====== Updating the .mailmap file ====== ====== Updating the .mailmap file ======
  
-The **[[https://git-scm.com/docs/git-check-mailmap|.mailmap]] file** allows Git to handle user aliases.+The **[[https://git-scm.com/docs/git-check-mailmap#_mapping_authors|.mailmap file]]** allows Git to handle user aliases.
  
 It is useful to maintain a clean and consistent list of authors, for example if users changed e-mail addresses or used different names when checking in their commits. It is useful to maintain a clean and consistent list of authors, for example if users changed e-mail addresses or used different names when checking in their commits.
Line 8: Line 8:
 ===== Identifying duplicate authors in Git history ===== ===== Identifying duplicate authors in Git history =====
  
-This section provides command to identify duplicates, that would require an entry in the .mailmap file.+This section provides commands to identify duplicates that require an entry in the .mailmap file. 
 + 
 +<WRAP tip> 
 +This section is for documentation purposes only. 
 + 
 +Since 2.25.8, these checks are executed as part of the //update-credits.sh// script, which will output a list of duplicate entries to be added. Skip to the [[#updating_mailmap | Updating .mailmap section]] below. 
 +</WRAP> 
 + 
 +If there is no output, then there's nothing to do ! :-)
  
 ==== Multiple e-mail addresses ==== ==== Multiple e-mail addresses ====
Line 34: Line 42:
 </code> </code>
  
-See [[#references|Reference section]] below for details .mailmap file syntax.+See [[#references|Reference section]] below for details about .mailmap file syntax.
  
 ===== Example ===== ===== Example =====
  
-The example below was generated on the MantisBT repository, after deleting ''.mailmap''. For the sake of simplicity, only +The example below was generated on the MantisBT repository, after removing Victor's aliases from the ''.mailmap'' file.
  
-  - Identify <code>+  - Identify duplicates <code>
 $ git log --format='%aN <%aE>' | sort -u | awk -F'<' '{print $1}' | uniq -c | grep -v '^ *1 '| cut -c9- $ git log --format='%aN <%aE>' | sort -u | awk -F'<' '{print $1}' | uniq -c | grep -v '^ *1 '| cut -c9-
 Victor Boctor  Victor Boctor 
Line 65: Line 73:
 ===== References ===== ===== References =====
  
-  * [[https://git-scm.com/docs/git-check-mailmap|Git manual]]+  * [[https://git-scm.com/docs/gitmailmap|Git manual]]
   * [[https://blog.developer.atlassian.com/aliasing-authors-in-git/|Aliasing authors in Git (Atlassian blog)]]   * [[https://blog.developer.atlassian.com/aliasing-authors-in-git/|Aliasing authors in Git (Atlassian blog)]]
  
mantisbt/mailmap.1565306694.txt.gz · Last modified: by dregad
CC Attribution-Noncommercial-Share Alike 4.0 International Driven by DokuWiki