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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 1, 2017, 11:06 UTC
Message-ID: <alpine.DEB.2.20.1705011305570.3480@virtualbox>
In-Reply-To: <xmqqtw55jta7.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Sun, 30 Apr 2017, Junio C Hamano wrote:

Show 18 quoted lines

> Phillip Wood <phillip.wood@talktalk.net> 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 <abbrev sha1>' rather than 'pick <abbrev sha1>
> > <subject>'
> >
> > I only picked this up because I have a script that does 'git -c
> > rebase.instructionFormat= rebase -i' with a custom sequence editor.
> 
> Sorry to hear that.  As there is no way to unset a configuration
> variable from the command line, "git -c var=" like you did above is
> the best we can do, and that why treating unset and empty variable
> the same way is often necessary.  It seems that Dscho gave an ack to
> your message, so hopefully the final version would not have such a
> regression.

As I mentioned in the cover letter of v4, unless you take v3 for the final version, the final version won't have such a regression:

> - the todo list is generated is again generated in the same way as
>   before when rebase.instructionFormat is empty: it was interpreted as
>   if it had not been set

Ciao, Dscho