On Tue, Aug 30, 2011 at 02:21:13PM +0200, Michael J Gruber wrote: > > After playing around a bit with my earlier series, I made the > > realization (perhaps obvious to others :) ), that if you are in a > > pure-patch workflow, keeping the "---" in your commit message locally is > > much simpler. It follows the commit around through rebases > > automatically, it gets put into format-patch output automatically, and > > so forth. > > I'm confused: Does format-patch keep it or strip it as you say above? Format-patch will include the whole commit message, including "---" and what comes after. But an "am" recipient will strip it out of the commit message. IOW, you locally treat your "---" notes as part of the commit message, but in a pure-patch workflow, upstream treats it as something to be stripped out. So there is asymmetry in what is in your commit versus what is in upstream's commit. But that's OK, because how you treat the commit (something to be tweaked and rebased, and then mailed out) and how upstream treats it (something to go into the long-term project history) are different. But that breaks down if you ever want to share actual commit objects with upstream. > Anyways, notes survive rebase etc. You still have to manually configure: git config notes.rewriteRef refs/notes/commits Perhaps that is something that should be changed. > and at format-patch time you can decide whether you want to include > them or not (with my patch). Yeah. Don't get me wrong, I think putting "---" notes into git-notes is way more flexible. It's just that it's also more complex, and unnecessarily so for many use cases. We have some patches to hide that complexity, but I was at one point wondering if all of the complexity was worthwhile. But as I mentioned above, if you want to build anything more complex than a pure-patch workflow, the simple solution breaks down. So it probably is worth pursuing. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html