From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [RFC PATCH 08/11] rebase -i: use struct rebase_options to parse args
Date: Fri, 22 Mar 2019 12:34:40 +0900 [thread overview]
Message-ID: <xmqqlg17r38v.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <94fe6518-ca13-8eb8-d455-e2a6fcaeb1d6@gmail.com> (Phillip Wood's message of "Thu, 21 Mar 2019 14:59:49 +0000")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Junio
>
> On 21/03/2019 04:21, Junio C Hamano wrote:
>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>
>>> +static struct replay_opts get_replay_opts(const struct rebase_options *opts)
>>> +{
>>> + struct replay_opts replay = REPLAY_OPTS_INIT;
>>> +
>>> + sequencer_init_config(&replay);
>>> +
>>> + replay.action = REPLAY_INTERACTIVE_REBASE;
>>> + replay.signoff = opts->signoff;
>>> + replay.allow_ff = !(opts->flags & REBASE_FORCE);
>>> + if (opts->allow_rerere_autoupdate)
>>> + replay.allow_rerere_auto = opts->allow_rerere_autoupdate;
>>> + replay.allow_empty = 1;
>>> + replay.allow_empty_message = opts->allow_empty_message;
>>> + replay.verbose = opts->flags & REBASE_VERBOSE;
>>> + replay.reschedule_failed_exec = opts->reschedule_failed_exec;
>>> + replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
>>> + replay.strategy = opts->strategy;
>>> +
>>> + return replay;
>>> +}
>>
>> This calls init_config() and then sets .action; does it revert to
>> what dl/merge-cleanup-scissors-fix wants to do, which flipped the
>> order to fix some bug? It is a bit hard to tell.
>
> dl/merge-cleanup-scissors-fix changes sequencer_init_config() to
> depend on the value of action so action should to be set first. What
> is in pu at the moment in not quite right (though I'm not sure what
> the practical implications are as it looks like the rebase tests are
> passing[1]).
>
> [1] https://travis-ci.org/git/git/jobs/509332448
Yes, it actually is the reason why I left the seemingly-wrong merge
in 'pu' on purpose to see if we have enough test coverage.
> they'd both be in the same file. I think it would only need to share
> the definitions of struct rebase_options, enum rebase_action and the
> declaration of run_rebase_interactive(). Would you be happy with the
> addition of builtin/rebase.h (there don't seem to be another headers
> in that directory). We could leave rebase--interactive.c around until
> rebase--preserve-merges.sh is finally removed.
I think dl/merge-cleanup-scissors-fix is getting solid enough, so a
better alternative may be to base this on top of
reset e902e9bcae ;# The second batch
merge ag/sequencer-reduce-rewriting-todo
merge dl/merge-cleanup-scissors-fix
instead of basing it only on ag/sequencer-reduce-rewriting-todo.
Thanks.
next prev parent reply other threads:[~2019-03-22 3:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-19 19:03 [RFC PATCH 00/11] rebase -i run without forking rebase--interactive Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 01/11] sequencer: always discard index after checkout Phillip Wood
2019-03-20 1:50 ` Duy Nguyen
2019-03-21 14:35 ` Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 02/11] rebase: rename write_basic_state() Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 03/11] rebase: use OPT_RERERE_AUTOUPDATE() Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 04/11] rebase -i: combine rebase--interactive.c with rebase.c Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 05/11] rebase -i: remove duplication Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 06/11] rebase -i: use struct commit when parsing options Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 07/11] rebase -i: use struct object_id for squash_onto Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 08/11] rebase -i: use struct rebase_options to parse args Phillip Wood
2019-03-21 4:21 ` Junio C Hamano
2019-03-21 14:59 ` Phillip Wood
2019-03-22 3:34 ` Junio C Hamano [this message]
2019-03-21 21:13 ` Alban Gruin
2019-04-10 19:16 ` Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 09/11] rebase -i: use struct rebase_options in do_interactive_rebase() Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 10/11] rebase: use a common action enum Phillip Wood
2019-03-19 20:24 ` Ævar Arnfjörð Bjarmason
2019-03-21 14:43 ` Phillip Wood
2019-03-19 19:03 ` [RFC PATCH 11/11] rebase -i: run without forking rebase--interactive Phillip Wood
2019-03-20 20:50 ` [RFC PATCH 00/11] rebase -i " Josh Steadmon
2019-03-20 23:05 ` Ævar Arnfjörð Bjarmason
2019-03-21 14:40 ` Phillip Wood
2019-03-21 1:44 ` Junio C Hamano
2019-04-17 14:30 ` [PATCH v1 00/12] Run rebase -i " Phillip Wood
2019-04-17 14:30 ` [PATCH v1 01/12] sequencer: always discard index after checkout Phillip Wood
2019-04-17 14:30 ` [PATCH v1 02/12] rebase: don't translate trace strings Phillip Wood
2019-04-19 5:53 ` Junio C Hamano
2019-04-25 17:47 ` Phillip Wood
2019-04-17 14:30 ` [PATCH v1 03/12] rebase: rename write_basic_state() Phillip Wood
2019-04-17 14:30 ` [PATCH v1 04/12] rebase: use OPT_RERERE_AUTOUPDATE() Phillip Wood
2019-04-17 14:30 ` [PATCH v1 05/12] rebase -i: combine rebase--interactive.c with rebase.c Phillip Wood
2019-04-17 14:30 ` [PATCH v1 06/12] rebase -i: remove duplication Phillip Wood
2019-04-17 14:30 ` [PATCH v1 07/12] rebase -i: use struct commit when parsing options Phillip Wood
2019-04-17 14:30 ` [PATCH v1 08/12] rebase -i: use struct object_id for squash_onto Phillip Wood
2019-04-17 14:30 ` [PATCH v1 09/12] rebase -i: use struct rebase_options to parse args Phillip Wood
2019-04-17 14:30 ` [PATCH v1 10/12] rebase -i: use struct rebase_options in do_interactive_rebase() Phillip Wood
2019-04-17 14:30 ` [PATCH v1 11/12] rebase: use a common action enum Phillip Wood
2019-04-17 14:30 ` [PATCH v1 12/12] rebase -i: run without forking rebase--interactive Phillip Wood
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=xmqqlg17r38v.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).