From: Phillip Wood <phillip.wood@talktalk.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v4 0/5] am/rebase: share read_author_script()
Date: Thu, 1 Nov 2018 16:27:38 +0000 [thread overview]
Message-ID: <d1c28479-d0a5-8f0a-3a3b-d46477731a0f@talktalk.net> (raw)
In-Reply-To: <xmqq7ehxv6v0.fsf@gitster-ct.c.googlers.com>
Hi Junio
On 01/11/2018 03:01, Junio C Hamano wrote:
> Phillip Wood <phillip.wood@talktalk.net> writes:
>
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> Sorry for the confusion with v3, here are the updated patches.
>>
>> Thanks to Junio for the feedback on v2. I've updated patch 4 based on
>> those comments, the rest are unchanged.
>
> The mistake of overwriting -1 (i.e. earlier we detected dup) with
> the third instance of the same originates at [2/5], so updating
> [4/5] without fixing it at its source would mean [4/5] is not a pure
> code movement to make it available to libgit users---it instead hides
> a (not so important) bugfix in it.
Facepalm. Thanks for clearing up my mess, what you've got in pu looks
fine to me.
Thanks
Phillip
>
>>
>> v1 cover letter:
>>
>> This is a follow up to pw/rebase-i-author-script-fix, it reduces code
>> duplication and improves rebase's parsing of the author script. After
>> this I'll do another series to share the code to write the author
>> script.
>>
>>
>> Phillip Wood (5):
>> am: don't die in read_author_script()
>> am: improve author-script error reporting
>> am: rename read_author_script()
>> add read_author_script() to libgit
>> sequencer: use read_author_script()
>>
>> builtin/am.c | 60 ++--------------
>> sequencer.c | 192 ++++++++++++++++++++++++++++++++-------------------
>> sequencer.h | 3 +
>> 3 files changed, 128 insertions(+), 127 deletions(-)
prev parent reply other threads:[~2018-11-01 16:27 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 10:10 [PATCH 0/3] am/rebase: share read_author_script() Phillip Wood
2018-09-12 10:10 ` [PATCH 1/3] am: rename read_author_script() Phillip Wood
2018-09-12 10:10 ` [PATCH 2/3] add read_author_script() to libgit Phillip Wood
2018-09-13 23:49 ` Eric Sunshine
2018-10-10 10:14 ` Phillip Wood
2018-10-10 10:22 ` Eric Sunshine
2018-09-12 10:10 ` [PATCH 3/3] sequencer: use read_author_script() Phillip Wood
2018-09-12 12:14 ` Eric Sunshine
2018-09-14 0:31 ` Eric Sunshine
2018-10-10 10:35 ` Phillip Wood
2018-10-18 10:00 ` [PATCH v2 0/5] am/rebase: share read_author_script() Phillip Wood
2018-10-18 10:00 ` [PATCH v2 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-25 8:44 ` Junio C Hamano
2018-10-18 10:00 ` [PATCH v2 2/5] am: improve author-script error reporting Phillip Wood
2018-10-25 8:55 ` Junio C Hamano
2018-10-18 10:00 ` [PATCH v2 3/5] am: rename read_author_script() Phillip Wood
2018-10-18 10:00 ` [PATCH v2 4/5] add read_author_script() to libgit Phillip Wood
2018-10-18 10:00 ` [PATCH v2 5/5] sequencer: use read_author_script() Phillip Wood
2018-10-25 8:59 ` [PATCH v2 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-10-26 9:00 ` Phillip Wood
2018-10-26 13:32 ` Junio C Hamano
2018-10-30 10:39 ` [PATCH v3 " Phillip Wood
2018-10-30 10:39 ` [PATCH v3 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-30 10:39 ` [PATCH v3 2/5] am: improve author-script error reporting Phillip Wood
2018-10-30 10:39 ` [PATCH v3 3/5] am: rename read_author_script() Phillip Wood
2018-10-30 10:39 ` [PATCH v3 4/5] add read_author_script() to libgit Phillip Wood
2018-10-30 10:39 ` [PATCH v3 5/5] sequencer: use read_author_script() Phillip Wood
2018-10-31 2:50 ` [PATCH v3 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-10-31 10:14 ` Phillip Wood
2018-10-31 10:15 ` [PATCH v4 " Phillip Wood
2018-10-31 10:15 ` [PATCH v4 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-31 10:15 ` [PATCH v4 2/5] am: improve author-script error reporting Phillip Wood
2018-11-04 4:12 ` Eric Sunshine
2018-11-05 1:53 ` Junio C Hamano
2018-10-31 10:15 ` [PATCH v4 3/5] am: rename read_author_script() Phillip Wood
2018-10-31 10:15 ` [PATCH v4 4/5] add read_author_script() to libgit Phillip Wood
2018-10-31 10:15 ` [PATCH v4 5/5] sequencer: use read_author_script() Phillip Wood
2018-11-01 3:01 ` [PATCH v4 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-11-01 3:12 ` [PATCH v4fixed 2/5] am: improve author-script error reporting Junio C Hamano
2018-11-01 3:12 ` [PATCH v4fixed 4/5] add read_author_script() to libgit Junio C Hamano
2018-11-01 16:27 ` Phillip Wood [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d1c28479-d0a5-8f0a-3a3b-d46477731a0f@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).