Re: [PATCH v4 0/3] Add mailmap mechanism in cat-file options

From: Taylor Blau <me@ttaylorr.com>
Date: Nov 14, 2022, 22:30 UTC
Message-ID: <Y3LBkZI6x9Iz8lgo@nand.local>
In-Reply-To: <CAP8UFD1nhXnYUj9zsXwvf2tjeK1yimY3AwomU30wor1Vf-QPbA@mail.gmail.com>

On Mon, Nov 14, 2022 at 06:48:54PM +0100, Christian Couder wrote:

Show 13 quoted lines

> > = 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.
>
> So the documentation patch is now part of this small series again.

For what it's worth, I'm fine to include the documentation updates in this series. It makes it vaguely easier to queue, but I think if we're close to merging this one down, then there's no reason to separate the two.

Show 6 quoted lines

> Even if this documentation patch is a bug fix, it might be better at
> this point to squash this patch into the patches 1/3 and 2/3. At least
> I think that would better follow Junio's last comments about this. If
> you go this way, you might want to squash the documentation parts
> about -s from patch 3/3 into patch 1/3 and the rest of patch 3/3 into
> patch 2/3.

Thanks. I agree with you that following Junio's advice in this instance is good to do. Let's wait for one hopefully-final reroll and then start merging this down.

Thanks, Taylor