Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Phillip, On Mon, 1 May 2017, Phillip Wood wrote: > On 28/04/17 20:22, Johannes Schindelin wrote: > > > BTW in the future you could help me a *lot* by providing a patch that > > adds a test case to our test suite that not only demonstrates what > > exactly goes wrong, but also will help

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Junio, On Sun, 30 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > In that case, I would strongly advise to consider redesigning the API. > > The API we currently have and is used by "log", "rev-list" and friends > is to have setup_revisions()

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Junio, On Sun, 30 Apr 2017, Junio C Hamano wrote: > Phillip Wood writes: > > > This changes the behaviour of > > git -c rebase.instructionFormat= rebase -i > > The shell version treats the rebase.instructionFormat being unset or set > > to the empty string as

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

On 28/04/17 20:22, Johannes Schindelin wrote: > Hi Philip, > > On Fri, 28 Apr 2017, Phillip Wood wrote: > >> On 26/04/17 12:59, Johannes Schindelin wrote: >> >>> The first step of an interactive rebase is to generate the so-called >>> "todo script", to be stored in the state directory as >>>

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Johannes Schindelin writes: > In that case, I would strongly advise to consider redesigning the API. The API we currently have and is used by "log", "rev-list" and friends is to have setup_revisions() parse the av[], i.e. the textual API, and it is sufficient to hide

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Phillip Wood writes: > This changes the behaviour of > git -c rebase.instructionFormat= rebase -i > The shell version treats the rebase.instructionFormat being unset or set > to the empty string as equivalent. This version generates a todo list > with lines like 'pick

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Philip, On Fri, 28 Apr 2017, Phillip Wood wrote: > On 26/04/17 12:59, Johannes Schindelin wrote: > > > The first step of an interactive rebase is to generate the so-called > > "todo script", to be stored in the state directory as > > "git-rebase-todo" and to be edited by the user. > > > >

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Junio, On Thu, 27 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Wed, 26 Apr 2017, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > diff --git a/sequencer.c b/sequencer.c > >> > index

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

On 26/04/17 12:59, Johannes Schindelin wrote: > The first step of an interactive rebase is to generate the so-called "todo > script", to be stored in the state directory as "git-rebase-todo" and to > be edited by the user. > > Originally, we adjusted the output of `git log ` using a simple > sed

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Junio C Hamano writes: > Yes. The "pretty_given" trick is one example that the underlying > implementation can change over time. If you wrote this patch before > 66b2ed09 ("Fix "log" family not to be too agressive about showing > notes", 2010-01-20) happened, you wouldn't

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Johannes Schindelin writes: > Hi Junio, > > On Wed, 26 Apr 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > diff --git a/sequencer.c b/sequencer.c >> > index 77afecaebf0..e858a976279 100644 >> > --- a/sequencer.c >> >

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Hi Junio, On Wed, 26 Apr 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/sequencer.c b/sequencer.c > > index 77afecaebf0..e858a976279 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -2388,3 +2388,48 @@ void

Re: [PATCH v3 1/9] rebase -i: generate the script via rebase--helper

Johannes Schindelin writes: > diff --git a/sequencer.c b/sequencer.c > index 77afecaebf0..e858a976279 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -2388,3 +2388,48 @@ void append_signoff(struct strbuf *msgbuf, int > ignore_footer, unsigned flag) > >

[PATCH v3 1/9] rebase -i: generate the script via rebase--helper

The first step of an interactive rebase is to generate the so-called "todo script", to be stored in the state directory as "git-rebase-todo" and to be edited by the user. Originally, we adjusted the output of `git log ` using a simple sed script. Over the course of the years, the code became more