Sorry I sent the part below privately by mistake: On Tue, Aug 25, 2015 at 11:07 PM, Matthieu Moy <matthieu....@grenoble-inp.fr> wrote: > > 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....@imag.fr> > --- a/git-multimail/README > +++ b/git-multimail/README
This might be a bug. I will have a look. > 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. There is already code to detect a patch in interpret-trailers, but it relies on the patch starting with a line with only three dashes. So another option would be to make "commit -v" emit a line with three dashes just under the "# Everything below will be removed." line. > 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"). Maybe. I don't know if there is a reason why the commit-msg is called before removing the patch. On Wed, Aug 26, 2015 at 8:28 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: > > It's always confused me why commit -v doesn't prepend every inserted > line with "#" to mark it as a comment. I think that would make interpret-trailers work properly too. Thanks both, Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
