Re: [PATCH v4 0/8] Reimplement rebase --merge via interactive machinery

From: Elijah Newren <newren@gmail.com>
Date: Jan 11, 2019, 18:36 UTC
Message-ID: <CABPp-BHbCnhLypi0Ov_dVUWwqzW7Yho4-G7w=eHVLkJvT6kELg@mail.gmail.com>
In-Reply-To: <CABPp-BFckuONYcGGkCY3BuPypRULmhsk_OFHyYA2E4jM66BfeQ@mail.gmail.com>

Hi Junio,

A small update...

On Mon, Jan 7, 2019 at 12:39 PM Elijah Newren <newren@gmail.com> wrote:

Show 9 quoted lines

> On Mon, Jan 7, 2019 at 12:11 PM Junio C Hamano <gitster@pobox.com> wrote:
> > Junio C Hamano <gitster@pobox.com> writes:
> >
> > > Elijah Newren <newren@gmail.com> writes:
> > >
> > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren <newren@gmail.com> wrote:
> > >>>
> > >>> This series continues the work of making rebase more self-consistent
> > >>> by removing inconsistencies between different backends.  In

....

> > > P.S. even if that one is latest, I would need to downcase Implement
> > > before it hits 'next' ;-)

...

> > Ah, one thing I forgot to mention.  Some of the tests updated in
> > this series are unhappy with Dscho's "drive 'am' directly from the
> > built-in code, bypassing git-rebase--am.sh scriptlet" topic.

It looks like you've already done the downcasing in pu; thanks. Also, Dscho told me in private email that:

    "FWIW I am fine with your patches going in first, and I would rebase mine
on top. It will take me probably until next week to get to my patch
series and Junio's comments, anyway."

So, I'm guessing that means he'll apply my patch below to his series. As such, other than maybe wait for folks to review my updated series, I'm not aware of any further changes I need to make to the en/rebase-merge-on-sequencer topic.

Show 24 quoted lines

> Dscho: Looks like our series conflicts slightly.  Would you like me to
> rebase mine on top of yours and squash the following change into
> commit c91c944a068e ("rebase: define linearization ordering and
> enforce it", 2018-12-11), or do you want to rebase your series on mine
> and either make a new commit out of this change or squash it in
> somewhere?
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 0317280f83..54023547ff 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -578,7 +578,8 @@ static int run_am(struct rebase_options *opts)
>         argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
>                          "--full-index", "--cherry-pick", "--right-only",
>                          "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
> -                        "--no-cover-letter", "--pretty=mboxrd", NULL);
> +                        "--no-cover-letter", "--pretty=mboxrd",
> +                        "--topo-order", NULL);
>         if (opts->git_format_patch_opt.len)
>                 argv_array_split(&format_patch.args,
>                                  opts->git_format_patch_opt.buf);
>
>
> Elijah