Re: [RFC/PATCH] commit notes workflow
Jeff King venit, vidit, dixit 25.02.2011 14:30:
Show 52 quoted lines
> I was revising a long-ish series today, and I have been wanting to start
> using "git notes" to store information on what's changed between
> versions (which will eventually go after the "---" in format-patch).
>
> So my workflow was something like:
>
> 1. git rebase -i, mark one or more commits for edit
>
> 2. For each commit we stop at:
>
> a. Tweak the tree either with enhancements, or to resolve
> conflicts from tweaks to earlier patches.
>
> b. commit --amend, tweak commit message is needed
>
> c. git notes add, mention changes
>
> d. git rebase --continue
>
> Two things annoyed me:
>
> 1. Editing the commit message and notes separately felt awkward. They
> are conceptually part of the same task to me.
>
> 2. In the conflict case, there is no opportunity to run "git notes
> add" because you fix up commits and directly run "rebase
> --continue".
>
> So my solution was that "git commit" should be able to embed and extract
> notes from the commit message itself. The patch below implements "git
> commit --notes", which does two things:
>
> 1. If we are amending, it populates the commit message not just with
> the existing message, but also with a "---" divider and any notes on
> the commit.
>
> 2. After editing the commit message, it looks for the "---" divider
> and puts everything after it into a commit note (whether or not it
> put in a divider in step (1), so you can add new notes, too).
>
> So your commit template looks like:
>
> subject
>
> commit message body
> ---
> notes data
>
> # usual template stuff
>
> I'm curious what people think. Do others find this useful? Does it seem
> harmful?
I can haz tis wiz "format-patch --notes-behind-triple-dash"?
Michael