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

From: Thiago Farina <tfransosi@gmail.com>
Date: Apr 22, 2015, 19:57 UTC
Message-ID: <CACnwZYcD7ryJqM+85wxka+ViqOfy51bOgyetUEdgY1pcQPJv=A@mail.gmail.com>
In-Reply-To: <CAGZ79ka1U8SP-7b_Jbm--1j1sz0iHKd+v-WNCASAXH+kystefA@mail.gmail.com>

On Wed, Apr 22, 2015 at 4:50 PM, Stefan Beller <sbeller@google.com> wrote:

Show 24 quoted lines

> On Wed, Apr 22, 2015 at 12:38 PM, Thiago Farina <tfransosi@gmail.com> wrote:
>>>
>> 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
>

Is that capable of keeping the next patch set in the same thread that started when you sent the initial patch? Otherwise things get disconnected.

-- 
Thiago Farina