Re: [PATCH v2 2/2] trailer: support multiline title

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Aug 26, 2015, 06:07 UTC
Message-ID: <vpqa8tetwfi.fsf@anie.imag.fr>
In-Reply-To: <1440557461-1078-2-git-send-email-chriscool@tuxfamily.org>

Christian Couder <christian.couder@gmail.com> writes:

Show 5 quoted lines

> 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,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/