Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-29 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > structure (similar in spirit to --preserve-merges, but with a > > substantially less-broken design). > > ... > > @@ -2785,6 +2787,335 @@ void append_signoff(struct strbuf *msgbuf, int > > ignore_footer, un

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-29 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Eric Sunshine writes: > > >> + is_octopus = to_merge && to_merge->next; > >> + > >> + if (is_octopus) > >> + BUG("Octopus merges not yet supported"); > > > > Is this a situation which the en

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-29 Thread Johannes Schindelin
Hi Eric, On Fri, 19 Jan 2018, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin > wrote: > > > structure (similar in spirit to --preserve-merges, but with a > > substantially less-broken design). > > [...] > > Signed-off-by: Johannes Schindelin > > --- > > diff --git

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-23 Thread Junio C Hamano
Eric Sunshine writes: >> + is_octopus = to_merge && to_merge->next; >> + >> + if (is_octopus) >> + BUG("Octopus merges not yet supported"); > > Is this a situation which the end-user can trigger by specifying a > merge with more than two parents?

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-23 Thread Junio C Hamano
Johannes Schindelin writes: > The sequencer just learned a new commands intended to recreate branch s/a //; > structure (similar in spirit to --preserve-merges, but with a > substantially less-broken design). > ... > @@ -2785,6 +2787,335 @@ void append_signoff(struct strbuf *msgbuf, int > igno

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-19 Thread Eric Sunshine
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin wrote: > The sequencer just learned a new commands intended to recreate branch s/a // > structure (similar in spirit to --preserve-merges, but with a > substantially less-broken design). > [...] > Signed-off-by: Johannes Schindelin > --- > d

Re: [PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-18 Thread Philip Oakley
From: "Johannes Schindelin" The sequencer just learned a new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of these commands, triggered by the

[PATCH 4/8] rebase-helper --make-script: introduce a flag to recreate merges

2018-01-18 Thread Johannes Schindelin
The sequencer just learned a new commands intended to recreate branch structure (similar in spirit to --preserve-merges, but with a substantially less-broken design). Let's allow the rebase--helper to generate todo lists making use of these commands, triggered by the new --recreate-merges option.