From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Storm-Olsen Subject: [PATCH v5 0/5] Extend mailmap functionality Date: Sun, 8 Feb 2009 15:34:26 +0100 Message-ID: Cc: gitster@pobox.com, Marius Storm-Olsen To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Feb 08 15:39:33 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LWAmx-0005L3-Sq for gcvg-git-2@gmane.org; Sun, 08 Feb 2009 15:37:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751840AbZBHOgO (ORCPT ); Sun, 8 Feb 2009 09:36:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751890AbZBHOgM (ORCPT ); Sun, 8 Feb 2009 09:36:12 -0500 Received: from hoat.troll.no ([62.70.27.150]:37737 "EHLO hoat.troll.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751637AbZBHOgK (ORCPT ); Sun, 8 Feb 2009 09:36:10 -0500 Received: from hoat.troll.no (tedur.troll.no [62.70.27.154]) by hoat.troll.no (Postfix) with SMTP id 406E8211DA; Sun, 8 Feb 2009 15:36:02 +0100 (CET) Received: from localhost.localdomain (unknown [172.24.90.96]) by hoat.troll.no (Postfix) with ESMTP id 26C7E21165; Sun, 8 Feb 2009 15:36:02 +0100 (CET) X-Mailer: git-send-email 1.6.2.rc0.5.gf970 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 ( 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(, , ); * 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 while this patch series adds support for Proper Name Proper Name Commit Name 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 ' in the public repo, but by using an private mailmap file, map the name back to 'John Doe ' 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