Re: About my git workflow; maybe it's useful for others

From: Stefan Beller <sbeller@google.com>
Date: Apr 22, 2015, 19:50 UTC
Message-ID: <CAGZ79ka1U8SP-7b_Jbm--1j1sz0iHKd+v-WNCASAXH+kystefA@mail.gmail.com>
In-Reply-To: <CACnwZYf6-Fh0JZeJZ4j3QOyqRF_2-NKJB06Wh20ipsRmrRN+qw@mail.gmail.com>

On Wed, Apr 22, 2015 at 12:38 PM, Thiago Farina <tfransosi@gmail.com> wrote:

Show 8 quoted lines

>>
> IMO, sending email is the easiest part.
>
> The hard begins when you have to edit your patch and resend with the
> reviewers' feedback incorporated. For me that is the most tricky and
> hard part to get right, specially when using GMail as an email client.
>
> How do you handle that part of the process?

I try to have as much in git as possible.

So when the reviews trickle in, I change my commits (in git) accordingly via rebase and edit and lots of fixup commits. I use git notes to keep track of changes from one version to another.

Having the "changes of the changes" in the git notes, I am (in theory) always able to kick out a new version of the patch series with

   rm 00* # delete old patches
   git format-patch --notes --coverletter somebranch...HEAD
   edit 0000-cover-letter.patch
   git send-email 00* --to=mailing list --to=John@doe.org --cc=Max@Mustermann.de

which is only a few steps, so there is not much to go wrong here.

For me the biggest thing is to know when to send out new patches. (Do I sleep over it and review it again myself, or do I just gun it, believing my patches are good this time?)

>
> --
> Thiago Farina