From: Junio C Hamano <gitster@pobox•com>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: Michael Blume <blume.mike@gmail•com>,
Stefan Beller <sbeller@google•com>,
Marius Storm-Olsen <marius@trolltech•com>,
Julian Phillips <julian@quantumfyre•co.uk>,
Git List <git@vger•kernel.org>
Subject: Re: [PATCHv3 2/3] mailmap: use higher level string list functions
Date: Sun, 30 Nov 2014 16:47:40 -0800 [thread overview]
Message-ID: <xmqq7fyctcur.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAPig+cRNuuDDBV0-TwANuiv+f_c1mfXp2Q4rF1Sj5mtJoLoqHQ@mail.gmail.com> (Eric Sunshine's message of "Thu, 27 Nov 2014 14:57:10 -0500")
Eric Sunshine <sunshine@sunshineco•com> writes:
> On Thu, Nov 27, 2014 at 1:44 PM, Michael Blume <blume.mike@gmail•com> wrote:
>> The variable index seems to be unused/uninitialized now -- it's still
>> printed in debug messages, but if I'm reading correctly, its contents are
>> going to be nonsense.
>
> Nice catch.
Let's do something like this squashed in, then.
mailmap.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/mailmap.c b/mailmap.c
index 3b00a65..cb26af0 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -90,8 +90,8 @@ static void add_mapping(struct string_list *map,
}
if (old_name == NULL) {
- debug_mm("mailmap: adding (simple) entry for %s at index %d\n",
- old_email, index);
+ debug_mm("mailmap: adding (simple) entry for '%s'\n", old_email);
+
/* Replace current name and new email for simple entry */
if (new_name) {
free(me->name);
@@ -103,8 +103,7 @@ static void add_mapping(struct string_list *map,
}
} else {
struct mailmap_info *mi = xcalloc(1, sizeof(struct mailmap_info));
- debug_mm("mailmap: adding (complex) entry for %s at index %d\n",
- old_email, index);
+ debug_mm("mailmap: adding (complex) entry for '%s'\n", old_email);
if (new_name)
mi->name = xstrdup(new_name);
if (new_email)
next prev parent reply other threads:[~2014-12-01 0:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <xmqq3898w9v4.fsf@gitster.dls.corp.google.com>
2014-11-24 21:52 ` [PATCH 2/3 v2] mailmap: use higher level string list functions Stefan Beller
2014-11-25 2:36 ` Eric Sunshine
2014-11-25 3:44 ` [PATCHv3 2/3] " Stefan Beller
[not found] ` <CAO2U3QjNua2HvJKLnq80mPFEp931yLzHKENKo-LHm4CFZWRhBA@mail.gmail.com>
2014-11-27 19:57 ` Eric Sunshine
2014-12-01 0:47 ` Junio C Hamano [this message]
2014-12-01 2:33 ` Stefan Beller
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=xmqq7fyctcur.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=blume.mike@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=julian@quantumfyre$(echo .)co.uk \
--cc=marius@trolltech$(echo .)com \
--cc=sbeller@google$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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