From: Marius Storm-Olsen <marius@trolltech.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Marius Storm-Olsen <marius@trolltech.com>
Subject: [PATCH v5 0/5] Extend mailmap functionality
Date: Sun, 8 Feb 2009 15:34:26 +0100 [thread overview]
Message-ID: <cover.1234102794.git.marius@trolltech.com> (raw)
v5:
---
* Rename log.mailmap variable to mailmap.file
* Fix mailmap tests using shortlog, by adding HEAD
* Factor out the mailmap documentation, and include it from both
git-shortlog.txt and git-blame.txt, since they both use mailmap
directly. Link to these from pretty-format.txt, for all commands
using the pretty option.
v4:
---
* Refactored out name and email parsing into separate function
* Added support for only email replacement (<new> <old> construct)
* Added "static" to functions local to compile unit only
* Fixed C++ style comment to bash style comment in commit message
* Added more air in the commit messages
* Rebased ontop of latest master
v3:
---
* Make log.mailmap augment repo "/.mailmap" rather than override
* Remove second argument of read_mailmap(<map>, <file>, <abbrev>);
* Wrap commit messages within column 70
v2:
---
* Folded in documentation fixup from patch 4 into patch 3.
This patch series extends the mailmap functionality to:
1) Allow the mailmap file in any location (also outside repo)
2) Enable mailmap to match on both Name and Email
So, why would this be a good thing?
2) Lets you replace both name and email of an author/committer, based
on a name and/or email, _and_ replace email only, based on old email.
So, should you have done commits with faulty address, or if an old
email simply isn't valid anymore, you can add a mapping for that to
replace it. So, the old style mapping is
Proper Name <commit@email.xx>
while this patch series adds support for
<proper@email.xx> <commit@email.xx>
Proper Name <proper@email.xx> <commit@email.xx>
Proper Name <proper@email.xx> Commit Name <commit@email.xx>
1) Lets you keep a private mailmap file, which is not distributed with
your repository.
This extended mapping is necessary when a company wants to have their
repositories open to the public, but needs to protect the identities
of the developers. It enables you to only show nicks and standardized
emails, like 'Dev123 <bugs@company.xx>' in the public repo, but by
using an private mailmap file, map the name back to
'John Doe <john.doe@company.xx>' inside the company.
Patch serie applies cleanly on master branch (88ccb9f9), and test run
shows no regressions.
Marius Storm-Olsen (5):
Add mailmap.file as configurational option for mailmap location
Add find_insert_index, insert_at_index and clear_func functions to
string_list
Add map_user() and clear_mailmap() to mailmap
Change current mailmap usage to do matching on both name and email of
author/committer.
Move mailmap documentation into separate file
Documentation/config.txt | 8 ++
Documentation/git-blame.txt | 6 +
Documentation/git-shortlog.txt | 49 ++-------
Documentation/mailmap.txt | 75 +++++++++++++
Documentation/pretty-formats.txt | 6 +-
builtin-blame.c | 52 ++++++----
builtin-shortlog.c | 25 ++++-
cache.h | 1 +
config.c | 12 ++
mailmap.c | 208 +++++++++++++++++++++++++++++++------
mailmap.h | 6 +-
pretty.c | 59 ++++++-----
string-list.c | 43 +++++++-
string-list.h | 9 ++
t/t4203-mailmap.sh | 215 ++++++++++++++++++++++++++++++++++++++
15 files changed, 644 insertions(+), 130 deletions(-)
create mode 100644 Documentation/mailmap.txt
create mode 100755 t/t4203-mailmap.sh
next reply other threads:[~2009-02-08 14:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-08 14:34 Marius Storm-Olsen [this message]
2009-02-08 14:34 ` [PATCH v5 1/5] Add mailmap.file as configurational option for mailmap location Marius Storm-Olsen
2009-02-08 14:34 ` [PATCH v5 2/5] Add find_insert_index, insert_at_index and clear_func functions to string_list Marius Storm-Olsen
2009-02-08 14:34 ` [PATCH v5 3/5] Add map_user() and clear_mailmap() to mailmap Marius Storm-Olsen
2009-02-08 14:34 ` [PATCH v5 4/5] Change current mailmap usage to do matching on both name and email of author/committer Marius Storm-Olsen
2009-02-08 14:34 ` [PATCH v5 5/5] Move mailmap documentation into separate file Marius Storm-Olsen
2009-02-08 14:56 ` [PATCH v5 0/5] Extend mailmap functionality Marius Storm-Olsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1234102794.git.marius@trolltech.com \
--to=marius@trolltech.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).