Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Johannes Schindelin writes: >> > The original code is: >> > >> >. "$author_script" >> >> [...] >> >> If the code in the sequencer.c reads things other than the three >> variables we ourselves set, and make them into environment variables >> and propagate to

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Hi Junio, On Sat, 14 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > You stated elsewhere that converting a script into a builtin should focus > > on a faithful conversion. > > > > The original code is: > > > > . "$author_script" > > [...] >

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Johannes Schindelin writes: > You stated elsewhere that converting a script into a builtin should focus > on a faithful conversion. > > The original code is: > > . "$author_script" > > Granted, this *cannot* be converted faithfully without reimplementing a >

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Johannes Schindelin writes: > The problem in this instance was that the authorship is no longer retained > when continuing after resolving a conflict. Let me stress again that this > has not been a problem with v1 of sequencer-i, nor with v2. The regression > was

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Hi Junio, On Mon, 9 Jan 2017, Junio C Hamano wrote: > I however think that the renaming of read_author_script() is totally > backwards from maintainability's point of view. You stated elsewhere that converting a script into a builtin should focus on a faithful conversion. The original code

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Hi Junio, On Mon, 9 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v2: > > > > - fixed a TRANSLATORS: comment > > ... > > - replaced a spawned `diff-tree` command by code using the diff functions > > directly > > I just finished

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Junio C Hamano writes: > I ran out of time for the day and haven't looked at individual > patches yet. I may find other issues, but from the interdiff, that > was the only thing that I found even worse than the previous round, > and everything else was either the same or has

Re: [PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

Johannes Schindelin writes: > Changes since v2: > > - fixed a TRANSLATORS: comment > ... > - replaced a spawned `diff-tree` command by code using the diff functions > directly I just finished skimming the interdiff (the difference between the result of merging the

[PATCH v3 00/38] Teach the sequencer to act as rebase -i's backend

This marks the count down to '3': two more patch series after this (really tiny ones) and we have a faster rebase -i. The idea of this patch series is to teach the sequencer to understand all of the commands in `git-rebase-todo` scripts, to execute them and to behave pretty much very the same as