From: Stefan Beller <sbeller@google.com>
Date: Wed, 22 Apr 2015 20:38:31 GMT
Subject: Re: About my git workflow; maybe it's useful for others
Message-ID: <CAGZ79kb2z+CbHhqrB9xW85n_33V8=iYV3jGf9pCNDX181tm3JA@mail.gmail.com>
In-Reply-To: <CACnwZYcD7ryJqM+85wxka+ViqOfy51bOgyetUEdgY1pcQPJv=A@mail.gmail.com>

On Wed, Apr 22, 2015 at 12:57 PM, Thiago Farina <tfransosi@gmail.com> wrote:
> On Wed, Apr 22, 2015 at 4:50 PM, Stefan Beller <sbeller@google.com> wrote:
>> 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.

When typing it out quickly I forgot the --in-reply-to=<identifier>
option for the git send-email
command. The identifier needs to be looked u0p manually, which is
still a pain point in my workflow.

>
> --
> Thiago Farina