Re: [GSoC][PATCH v2 2/2] rebase--interactive: rewrite the edit-todo functionality in C
- From
Elijah Newren <newren@gmail.com>
- Date
- Jun 14, 2018, 20:42 UTC
- Message-ID
- <CABPp-BHRK5eNRY-WC9gbzPvw0tZcN2GYgSnLv2UJNUBqsRR6Gw@mail.gmail.com>
- In-Reply-To
- <e5e50510-8297-6e1b-d446-d717b021c6f0@gmail.com>
Hi Alban,
On Thu, Jun 14, 2018 at 1:24 PM, Alban Gruin <alban.gruin@gmail.com> wrote:
Show 22 quoted lines
> Le 14/06/2018 à 22:14, Junio C Hamano a écrit :
>> Alban Gruin <alban.gruin@gmail.com> writes:
>>
>>> diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
>>> index ded5e291d..d2990b210 100644
>>> --- a/builtin/rebase--helper.c
>>> +++ b/builtin/rebase--helper.c
>>> @@ -12,12 +12,12 @@ static const char * const builtin_rebase_helper_usage[] = {
>>> int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
>>> {
>>> struct replay_opts opts = REPLAY_OPTS_INIT;
>>> - unsigned flags = 0, keep_empty = 0, rebase_merges = 0, write_edit_todo = 0;
>>> + unsigned flags = 0, keep_empty = 0, rebase_merges = 0;
>>
>> Sorry, but where does "write_edit_todo = 0" in the preimage come from?
>>
>
> It comes from my conversion of append_todo_help()[0], on which this
> series is based.
>
> [0]
> https://public-inbox.org/git/20180607103012.22981-1-alban.gruin@gmail.com/Given that both Junio and I had the same basic question, you'll probably want to put dependency information into your cover letters. If a series applies on master, then this isn't needed. But if it requires other changes that are in a topic in next or pu, you can name the topic that it depends upon (e.g. ag/rebase-p, as from the "What's cooking" emails or you can grab them as branchnames from git://github.com/gitster/git). If the dependency is something that Junio hasn't picked up yet, provide a link to the other submission.
Others may have additional suggestions here...