On 2022-12-04 15:13:52 +0000, Phillip Wood wrote: > On 02/12/2022 17:01, Vincent Lefevre wrote: > > First, one issue is that this is not documented (I was not aware of > > the notion of trailers, well, at least concerning a special handling > > by Git). > > They are mentioned in the documentation for 'git commit' see the --signoff > and --trailer options. The main reference is 'git interpret-trailers' This issue occurs with "git cherry-pick -x", so that one could expect documentation there. Since I don't use trailers (this was a false positive), I wouldn't have the idea to look at the --trailer documentation. > > Then perhaps there should be some configuration to define which > > tokens are allowed (or forbidden) for trailers. For instance, > > I would say that "Note" is too common in log messages to be > > regarded as a trailer token. > > There are some safeguards when looking for trailers (see the > interpret-trailers man page) I think you have been unlucky here, I don't > remember this being reported before. I've cc'd Christian who knows more > about trailers than I do to see if he has anything to add. 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. -- Vincent Lefèvre <vincent@xxxxxxxxxx> - 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)