Re: Creating a patch set with git-format-patch

From: Stephan Beyer <s-beyer@gmx.net>
Date: Apr 10, 2008, 11:55 UTC
Message-ID: <20080410115523.GD8157@leksak.fem-net>
In-Reply-To: <20080410105610.GB29742@atjola.homenet>

Hi,

> Just create a branch for you work, then start working and creating
> commits.
> [...]

I've got a further question on that "patch-based" workflow because the documentation always stops at "send the patch".

Case 1:
 Assume your patch series get accepted.
 What to do with your local changes branch, say "my-changes"?
 Keeping it would result in a lot of dead branches after a while.

 So, I guess "git branch -D my-changes" is the cleanest way to go,
 but I'm not sure.

Case 2:
 Assume your patch series is not accepted but some patches
 are discussed and need some further work.
 What to do?[1]

 I guess the right way is (after updating master) to rebase--interactive
 the my-changes branch to the master and "edit" every commit that
 need further changes. After the rebase with all changes has finished,
 format-patch and re-send the interesting patches 
 (or format-patch the whole my-changes branch down to master and re-send
  only the changed patches)...

Are my guesses "right" for the two cases? Comments?

Regards,
 Stephan

Footnotes:
  1. Yes, there is step (3) of "An ideal patch flow" in
     http://git.kernel.org/?p=git/git.git;a=blob;f=Documentation/SubmittingPatches
     but it does not suggest steps how to "polish" and "refine".

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F