On Fri, 17 Jan 2020, Iain Sandoe wrote: > So I know that the policy is under review (and agree, from my PoV, that > something that represents these in a similar way to the SVN single mail > containing all the changes is probably optimum). > > However, right now I’m stuck - and really want to get a short-term resolution > so that i can complete the merge of coroutines onto trunk. > > I guess I could do a squashed merge from trunk - presumably, that would only > generate 1 email?
You should include Joel on such questions as the expert on the hooks. I don't know whether there's something to put in the commit message to say "allow this merge of more than 100 commits". I don't think a squashed merge is the right workaround, supposing you do want the git ancestry information to reflect what got merged. The simple workaround is to do three successive merges, each of under 100 commits and each pushed separately. Alternatively, you could check out refs/meta/config, push a change that either increases hooks.max-commit-emails or sets hooks.no-emails to prevent mails for this branch, then push the merge, then push a reversion of the change to refs/meta/config. -- Joseph S. Myers jos...@codesourcery.com
