Re: Submit/Workflow question

From: J. Bruce Fields <bfields@fieldses.org>
Date: Jul 29, 2007, 16:03 UTC
Message-ID: <20070729160347.GA26637@fieldses.org>
In-Reply-To: <85abtfw6d5.fsf@lola.goethe.zz>

On Sun, Jul 29, 2007 at 05:56:54PM +0200, David Kastrup wrote:

Show 19 quoted lines

> 
> Suppose that I have created a half-baked patch A suiting my personal
> needs and went on from there, having something like
> 
> ...->A->B->...
> 
> Now at some point of time I decide that really A should be made fit
> for submission.  Basically, I'd want to do
> git-reset --hard A
> [edit some]
> git-commit --amend -a
> git-format-patch HEAD~1
> 
> in order to arrive at a nice submittable patch.  However, I don't want
> to lose B and the following stuff, and the resulting HEAD should
> include the improved of A (it is fine if that needs additional steps,
> and it is fine if it is just HEAD that gets the fixed version, not B).
> 
> So how to do this?  Branch at A^, rebase on A,

Just branch on A. Or actually I just check out A at this point (leaving me not on any branch).

> fix the stuff, commit
> with --amend -a, rebase on master, rename the temporary branch to
> master (killing the old master), format and submit the patch?

I'm not completely sure I follow that sequence, but something like that should work. A similar approach:

	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#modifying-one-commit

I do something pretty close to what's described there, except I generally just cut and paste SHA1's instead of making the temporary tag.

--b.