From: Jacob Keller <jacob.keller@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Christian Couder <christian.couder@gmail.com>,
git <git@vger.kernel.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v2 2/2] trailer: support multiline title
Date: Tue, 25 Aug 2015 23:28:36 -0700 [thread overview]
Message-ID: <CA+P7+xqaAKckB0P5oqFS64BWU2H1OsVX8Oq=CLLW8PMJ5fdenQ@mail.gmail.com> (raw)
In-Reply-To: <vpqa8tetwfi.fsf@anie.imag.fr>
On Tue, Aug 25, 2015 at 11:07 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Christian Couder <christian.couder@gmail.com> writes:
>
>> Unfortunately this does not work well when a commit is created with a
>> line break in the title, using for example the following command:
>>
>> git commit -m 'place of
>> code: change we made'
>
> I confirm that this patch fixes the behavior for me.
>
> Now, I found another issue: I still have this "interpret-trailers" in my
> hooks/commit-msg, and it behaves badly when I use "git commit -v". With
> -v, I get a diff in COMMIT_EDITMSG, and interpret-trailers tries to
> insert my Sign-off within the diff, like this:
>
> # Do not touch the line above.
> # Everything below will be removed.
> diff --git a/git-multimail/README b/git-multimail/README
> index f41906b..93d4751 100644
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> --- a/git-multimail/README
> +++ b/git-multimail/README
>
> Either commit-msg should be called after stripping the diff from
> COMMIT_MSG, or interpret-trailers should learn to stop reading when the
> patch starts. I think the first option is better, since it means that
> any commit-msg hook does not have to deal with the patch stuff (my guess
> is that there are many broken commit-msg hooks out there, but people
> didn't notice because they don't use "commit -v").
>
> Thanks,
>
It's always confused me why commit -v doesn't prepend every inserted
line with "#" to mark it as a comment.
Regards,
Jake
next prev parent reply other threads:[~2015-08-26 6:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 2:51 [PATCH v2 1/2] trailer: ignore first line of message Christian Couder
2015-08-26 2:51 ` [PATCH v2 2/2] trailer: support multiline title Christian Couder
2015-08-26 6:07 ` Matthieu Moy
2015-08-26 6:28 ` Jacob Keller [this message]
2015-08-26 14:53 ` Christian Couder
2015-08-26 16:05 ` Junio C Hamano
2015-08-26 16:15 ` Matthieu Moy
2015-08-26 19:48 ` Junio C Hamano
2015-08-29 4:00 ` Christian Couder
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='CA+P7+xqaAKckB0P5oqFS64BWU2H1OsVX8Oq=CLLW8PMJ5fdenQ@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
/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).