From: Siddharth Asthana <siddharthasthana31@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, gitster@pobox.com,
johncai86@gmail.com, Johannes.Schindelin@gmx.de,
avarab@gmail.com, me@ttaylorr.com,
Siddharth Asthana <siddharthasthana31@gmail.com>
Subject: [PATCH v4 0/3] Add mailmap mechanism in cat-file options
Date: Mon, 14 Nov 2022 02:58:27 +0530 [thread overview]
Message-ID: <20221113212830.92609-1-siddharthasthana31@gmail.com> (raw)
In-Reply-To: <20220916205946.178925-1-siddharthasthana31@gmail.com>
Thanks a lot Junio, Taylor and Christian for the review :) I have made
the suggested changes.
= Description
At present, `git-cat-file` command with `--batch-check` and `-s` options
does not complain when `--use-mailmap` option is given. The latter
option is just ignored. Instead, for commit/tag objects, the command
should compute the size of the object after replacing the idents and
report it. So, this patch series makes `-s` and `--batch-check` options
of `git-cat-file` honor mailmap when used with `--use-mailmap` option.
In this patch series we didn't want to change that '%(objectsize)'
always shows the size of the original object even when `--use-mailmap`
is set because first we have the long term plan to unify how the formats
for `git cat-file` and other commands works. And second existing formats
like the "pretty formats" used bt `git log` have different options for
fields respecting mailmap or not respecting it (%an is for author name
while %aN for author name respecting mailmap).
I would like to thank my mentors, Christian Couder and John Cai, for all
of their help!
Looking forward to the reviews!
= Patch Organization
- The first patch makes `-s` option to return updated size of the
<commit/tag> object, when combined with `--use-mailmap` option, after
replacing the idents using the mailmap mechanism.
- The second patch makes `--batch-check` option to return updated size of
the <commit/tag> object, when combined with `--use-mailmap` option,
after replacing the idents using the mailmap mechanism.
- The third patch improves the documentation of `-s`, `--batch`,
`--batch-check` and `--batch-command` options by adding they can be
combined with `--use-mailmap` options.
= Changes in v4
- Improve the documentation patch to clearly state that the `-s`,
`--batch-check`, `--batch-command` and `--batch` options can be only
be used with `--textconv`, `--filters` or `--use-mailmap`.
Siddharth Asthana (3):
cat-file: add mailmap support to -s option
cat-file: add mailmap support to --batch-check option
doc/cat-file: allow --use-mailmap for --batch options
Documentation/git-cat-file.txt | 53 ++++++++++++++++++++++--------
builtin/cat-file.c | 27 ++++++++++++++++
t/t4203-mailmap.sh | 59 ++++++++++++++++++++++++++++++++++
3 files changed, 125 insertions(+), 14 deletions(-)
Range-diff against v3:
1: 38bb89d350 ! 1: 4ae3af37d2 cat-file: add mailmap support to -s option
@@ Commit message
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: John Cai <johncai86@gmail.com>
+ Helped-by: Taylor Blau <me@ttaylorr.com>
+ Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com>
- ## Documentation/git-cat-file.txt ##
-@@ Documentation/git-cat-file.txt: OPTIONS
-
- -s::
- Instead of the content, show the object size identified by
-- `<object>`.
-+ `<object>`. If used with `--use-mailmap` option, will show the
-+ size of updated object after replacing idents using the mailmap
-+ mechanism.
-
- -e::
- Exit with zero status if `<object>` exists and is a valid
-
## builtin/cat-file.c ##
@@ builtin/cat-file.c: static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
2: 4d49cfde73 ! 2: a692646228 cat-file: add mailmap support to --batch-check option
@@ Commit message
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: John Cai <johncai86@gmail.com>
+ Helped-by: Taylor Blau <me@ttaylorr.com>
+ Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com>
- ## Documentation/git-cat-file.txt ##
-@@ Documentation/git-cat-file.txt: OPTIONS
- except `--textconv` or `--filters`, in which case the input lines
- also need to specify the path, separated by whitespace. See the
- section `BATCH OUTPUT` below for details.
-+ If used with `--use-mailmap` option, will show the size of
-+ updated object after replacing idents using the mailmap mechanism.
-
- --batch-check::
- --batch-check=<format>::
-
## builtin/cat-file.c ##
@@ builtin/cat-file.c: static void batch_object_write(const char *obj_name,
if (!data->skip_object_info) {
-: ---------- > 3: 41b4650b24 doc/cat-file: allow --use-mailmap for --batch options
--
2.38.1.420.g319605f8f0
next prev parent reply other threads:[~2022-11-13 21:28 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 20:59 [PATCH 0/3] Add mailmap mechanism in --batch-check options Siddharth Asthana
2022-09-16 20:59 ` [PATCH 1/3] doc/cat-file: allow --use-mailmap for --batch options Siddharth Asthana
2022-09-16 22:02 ` Junio C Hamano
2022-09-16 20:59 ` [PATCH 2/3] cat-file: add mailmap support to -s option Siddharth Asthana
2022-09-16 22:22 ` Junio C Hamano
2022-09-16 20:59 ` [PATCH 3/3] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-09-16 22:35 ` Junio C Hamano
2022-09-26 10:53 ` [PATCH v2 0/2] Add mailmap mechanism in cat-file options Siddharth Asthana
2022-09-26 10:53 ` [PATCH v2 1/2] cat-file: add mailmap support to -s option Siddharth Asthana
2022-09-26 13:16 ` Ævar Arnfjörð Bjarmason
2022-09-26 13:25 ` Ævar Arnfjörð Bjarmason
2022-09-26 10:53 ` [PATCH v2 2/2] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-10-29 10:24 ` [PATCH v3 0/2] Add mailmap mechanism in cat-file options Siddharth Asthana
2022-10-29 10:24 ` [PATCH v3 1/2] cat-file: add mailmap support to -s option Siddharth Asthana
2022-10-31 11:49 ` Christian Couder
2022-10-29 10:24 ` [PATCH v3 2/2] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-10-31 11:43 ` Christian Couder
2022-10-29 18:00 ` [PATCH v3 0/2] Add mailmap mechanism in cat-file options Taylor Blau
2022-11-13 21:28 ` Siddharth Asthana [this message]
2022-11-13 21:28 ` [PATCH v4 1/3] cat-file: add mailmap support to -s option Siddharth Asthana
2022-11-13 21:28 ` [PATCH v4 2/3] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-11-15 21:40 ` Taylor Blau
2022-11-13 21:28 ` [PATCH v4 3/3] doc/cat-file: allow --use-mailmap for --batch options Siddharth Asthana
2022-11-14 17:48 ` [PATCH v4 0/3] Add mailmap mechanism in cat-file options Christian Couder
2022-11-14 22:30 ` Taylor Blau
2022-11-20 7:42 ` Siddharth Asthana
2022-11-20 7:48 ` [PATCH v5 0/2] " Siddharth Asthana
2022-11-20 7:48 ` [PATCH v5 1/2] cat-file: add mailmap support to -s option Siddharth Asthana
2022-11-21 7:27 ` Junio C Hamano
2022-11-21 9:40 ` Christian Couder
2022-11-21 9:45 ` Junio C Hamano
2022-11-21 11:27 ` Ævar Arnfjörð Bjarmason
2022-11-20 7:48 ` [PATCH v5 2/2] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-11-21 7:38 ` Junio C Hamano
2022-11-30 9:19 ` Junio C Hamano
2022-12-01 15:55 ` [PATCH v6 0/2] Add mailmap mechanism in cat-file options Siddharth Asthana
2022-12-01 15:55 ` [PATCH v6 1/2] cat-file: add mailmap support to -s option Siddharth Asthana
2022-12-01 15:55 ` [PATCH v6 2/2] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-12-14 11:27 ` Ævar Arnfjörð Bjarmason
2022-12-14 14:04 ` Christian Couder
2022-12-20 6:01 ` [PATCH v7 0/2] Add mailmap mechanism in cat-file options Siddharth Asthana
2022-12-20 6:01 ` [PATCH v7 1/2] cat-file: add mailmap support to -s option Siddharth Asthana
2022-12-20 6:01 ` [PATCH v7 2/2] cat-file: add mailmap support to --batch-check option Siddharth Asthana
2022-12-20 13:02 ` [PATCH v7 0/2] Add mailmap mechanism in cat-file options Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221113212830.92609-1-siddharthasthana31@gmail.com \
--to=siddharthasthana31@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=me@ttaylorr.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).