From: Junio C Hamano <gitster@pobox.com>
To: Siddharth Asthana <siddharthasthana31@gmail.com>
Cc: git@vger.kernel.org, phillip.wood@dunelm.org.uk,
avarab@gmail.com, congdanhqx@gmail.com,
christian.couder@gmail.com, johncai86@gmail.com
Subject: Re: [PATCH v2 0/4] Add support for mailmap in cat-file
Date: Thu, 07 Jul 2022 15:58:29 -0700 [thread overview]
Message-ID: <xmqqmtdky1gq.fsf@gitster.g> (raw)
In-Reply-To: <xmqqsfncy3w1.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 07 Jul 2022 15:06:06 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Siddharth Asthana <siddharthasthana31@gmail.com> writes:
>
>> Changes in v2:
>> - The commit_rewrite_person() has been improved by restricting it to
>> traverse only the header part of the object buffers.
>> - The callers of commit_rewrite_person() now don't require to call it
>> multiple times for different headers. They can pass an array of
>> headers and commit_rewrite_person() replaces idents only on those
>> headers.
>> - commit_rewrite_person() has been renamed to a suitable name which
>> expresses its functionality clearly.
>> - More tests have been added to test the --[no-]-use-mailmap option for
>> the tag objects.
>> - Redundant operations from the tests have been removed.
>
> I agree with the general direction and the implementation strategy.
> I've noticed a few decl-after-statement and also at least one public
> helper function that does not need to be public. Are you building
> with "make DEVELOPER=YesPlease"? It enables -pedantic and -Werror,
> -Wdeclaration-after-statement, among other options (see the
> config.mak.dev file for the complete list) to help you catch these
> locally before sendign your patches to the list.
Here is what I prepared on top of your series to make them compile
while queuing them on a topic branch.
builtin/cat-file.c | 7 +++++--
revision.c | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 6dc750a367..4ca024a018 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -40,11 +40,14 @@ static const char *force_path;
static struct string_list mailmap = STRING_LIST_INIT_NODUP;
static int use_mailmap;
-char *replace_idents_using_mailmap(char *object_buf, size_t *size)
+static char *replace_idents_using_mailmap(char *, size_t *);
+
+static char *replace_idents_using_mailmap(char *object_buf, size_t *size)
{
struct strbuf sb = STRBUF_INIT;
- strbuf_attach(&sb, object_buf, *size, *size + 1);
const char *headers[] = { "author ", "committer ", "tagger ", NULL };
+
+ strbuf_attach(&sb, object_buf, *size, *size + 1);
apply_mailmap_to_header(&sb, headers, &mailmap);
*size = sb.len;
return strbuf_detach(&sb, NULL);
diff --git a/revision.c b/revision.c
index b561d6b5b5..767c6225df 100644
--- a/revision.c
+++ b/revision.c
@@ -3787,10 +3787,10 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
strbuf_addstr(&buf, message);
if (opt->grep_filter.header_list && opt->mailmap) {
+ const char *commit_headers[] = { "author ", "committer ", NULL };
+
if (!buf.len)
strbuf_addstr(&buf, message);
-
- const char *commit_headers[] = { "author ", "committer ", NULL };
apply_mailmap_to_header(&buf, commit_headers, opt->mailmap);
}
--
2.37.0-211-gafcdf5f063
next prev parent reply other threads:[~2022-07-07 22:58 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 14:24 [PATCH 0/3] Add support for mailmap in cat-file Siddharth Asthana
2022-06-30 14:24 ` [PATCH 1/3] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-06-30 16:00 ` Đoàn Trần Công Danh
2022-06-30 23:22 ` Junio C Hamano
2022-06-30 14:24 ` [PATCH 2/3] ident: rename commit_rewrite_person() to rewrite_ident_line() Siddharth Asthana
2022-06-30 15:33 ` Phillip Wood
2022-06-30 16:55 ` Christian Couder
2022-06-30 23:31 ` Junio C Hamano
2022-06-30 14:24 ` [PATCH 3/3] cat-file: add mailmap support Siddharth Asthana
2022-06-30 15:50 ` Phillip Wood
2022-06-30 16:36 ` Phillip Wood
2022-06-30 17:07 ` Christian Couder
2022-06-30 21:33 ` Junio C Hamano
2022-07-07 9:15 ` Christian Couder
2022-06-30 23:36 ` Ævar Arnfjörð Bjarmason
2022-06-30 23:53 ` Junio C Hamano
2022-07-07 9:02 ` Christian Couder
2022-06-30 23:41 ` Junio C Hamano
2022-06-30 21:18 ` [PATCH 0/3] Add support for mailmap in cat-file Junio C Hamano
2022-07-07 16:15 ` [PATCH v2 0/4] " Siddharth Asthana
2022-07-07 16:15 ` [PATCH v2 1/4] revision: improve commit_rewrite_person() Siddharth Asthana
2022-07-07 21:52 ` Junio C Hamano
2022-07-08 14:50 ` Đoàn Trần Công Danh
[not found] ` <CAP8UFD116xMnp27pxW8WNDf6PRJxnnwWtcy2TNHU_KyV2ZVA1g@mail.gmail.com>
2022-07-09 1:02 ` Đoàn Trần Công Danh
2022-07-09 5:04 ` Christian Couder
2022-07-07 16:15 ` [PATCH v2 2/4] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-07-07 16:15 ` [PATCH v2 3/4] ident: rename commit_rewrite_person() to apply_mailmap_to_header() Siddharth Asthana
2022-07-07 16:15 ` [PATCH v2 4/4] cat-file: add mailmap support Siddharth Asthana
2022-07-07 21:55 ` Junio C Hamano
2022-07-08 11:53 ` Johannes Schindelin
2022-07-07 22:06 ` [PATCH v2 0/4] Add support for mailmap in cat-file Junio C Hamano
2022-07-07 22:58 ` Junio C Hamano [this message]
2022-07-09 15:41 ` [PATCH v3 " Siddharth Asthana
2022-07-09 15:41 ` [PATCH v3 1/4] revision: improve commit_rewrite_person() Siddharth Asthana
2022-07-12 16:29 ` Johannes Schindelin
2022-07-09 15:41 ` [PATCH v3 2/4] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-07-09 15:41 ` [PATCH v3 3/4] ident: rename commit_rewrite_person() to apply_mailmap_to_header() Siddharth Asthana
2022-07-09 15:41 ` [PATCH v3 4/4] cat-file: add mailmap support Siddharth Asthana
2022-07-10 5:34 ` [PATCH v3 0/4] Add support for mailmap in cat-file Junio C Hamano
2022-07-12 12:34 ` Johannes Schindelin
2022-07-12 14:16 ` Junio C Hamano
2022-07-12 16:01 ` Siddharth Asthana
2022-07-12 16:06 ` Junio C Hamano
2022-07-12 16:06 ` [PATCH v4 " Siddharth Asthana
2022-07-12 16:06 ` [PATCH v4 1/4] revision: improve commit_rewrite_person() Siddharth Asthana
2022-07-13 1:25 ` Ævar Arnfjörð Bjarmason
2022-07-13 12:18 ` Christian Couder
2022-07-14 21:02 ` Junio C Hamano
2022-07-12 16:06 ` [PATCH v4 2/4] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-07-12 16:06 ` [PATCH v4 3/4] ident: rename commit_rewrite_person() to apply_mailmap_to_header() Siddharth Asthana
2022-07-13 1:25 ` Ævar Arnfjörð Bjarmason
2022-07-13 13:29 ` Christian Couder
2022-07-12 16:06 ` [PATCH v4 4/4] cat-file: add mailmap support Siddharth Asthana
2022-07-16 7:40 ` [PATCH v5 0/4] Add support for mailmap in cat-file Siddharth Asthana
2022-07-16 7:40 ` [PATCH v5 1/4] revision: improve commit_rewrite_person() Siddharth Asthana
2022-07-17 22:11 ` Junio C Hamano
2022-07-16 7:40 ` [PATCH v5 2/4] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-07-16 7:40 ` [PATCH v5 3/4] ident: rename commit_rewrite_person() to apply_mailmap_to_header() Siddharth Asthana
2022-07-16 7:40 ` [PATCH v5 4/4] cat-file: add mailmap support Siddharth Asthana
2022-07-18 19:50 ` [PATCH v6 0/4] Add support for mailmap in cat-file Siddharth Asthana
2022-07-18 19:50 ` [PATCH v6 1/4] revision: improve commit_rewrite_person() Siddharth Asthana
2022-07-18 19:51 ` [PATCH v6 2/4] ident: move commit_rewrite_person() to ident.c Siddharth Asthana
2022-07-18 19:51 ` [PATCH v6 3/4] ident: rename commit_rewrite_person() to apply_mailmap_to_header() Siddharth Asthana
2022-07-18 19:51 ` [PATCH v6 4/4] cat-file: add mailmap support Siddharth Asthana
2022-07-25 18:58 ` [PATCH v6 0/4] Add support for mailmap in cat-file Junio C Hamano
2022-07-28 19:07 ` Christian Couder
2022-07-28 19:32 ` Junio C Hamano
2022-07-30 7:50 ` Siddharth Asthana
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=xmqqmtdky1gq.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=siddharthasthana31@gmail.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).