Re: git cherry-pick -x: missing blank line before the "cherry picked from commit" line

From: Vincent Lefevre <vincent@vinc17.net>
Date: Dec 16, 2022, 01:15 UTC
Message-ID: <20221216011553.GE7846@zira.vinc17.org>
In-Reply-To: <CAP8UFD1G++GvNxCVdwDqSm4P3SseyOWNh2jKBZ4jm-OTn2Vsmg@mail.gmail.com>

On 2022-12-05 13:56:02 +0100, Christian Couder wrote:

Show 10 quoted lines

> On Sun, Dec 4, 2022 at 4:49 PM Vincent Lefevre <vincent@vinc17.net> wrote:
> > I think that what could be interesting there is a
> > trailer.<token>.separators option (assuming that one can
> > use an empty list of separators to disable a token), but
> > that doesn't exist.
> 
> There is the trailer.separators config option. I am not sure if it
> disables trailers completely though if it is empty. If it doesn't,
> that could be an interesting feature to implement for people who don't
> use trailers at all (except for lines added by cherry-pick).

I have not tried yet, but the drawback is that it could be used only if trailers are not used at all.

Show 5 quoted lines

> A trailer.<token>.separators option that disables some <token> when
> empty could be another interesting idea, but it might have drawbacks.
> For example you might disable the "note" token, but then find that
> people sometimes use "notes:" or "NB:" or "PS:" or other things like
> that at the end of their commit messages.

Yes, or "References:" or "https:". Like that, which has just happened to me: :-(

[...]
    References:
      https://sympa.inria.fr/sympa/arc/mpfr/2022-10/msg00001.html
      https://sympa.inria.fr/sympa/arc/mpfr/2022-10/msg00027.html
      https://gmplib.org/list-archives/gmp-bugs/2022-October/005200.html
    (cherry picked from commit 277faface2023449c91c1751630e760d136ae619)

Even when one knows the issue, it is too easy to forget it.

-- 
Vincent Lefèvre <vincent@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)