Git 2.26 rebase.backend change issue

Git 2.26 rebase.backend change issue

[Bastian Buchholz]

Hello,

Just wanted to report that I am running into issues with the git 2.26
`rebase.backend` change.
I am a maintainer on https://github.com/FredrikNoren/ungit which is a
UI for git using a http server / browser architecture.
We are using `git rebase` in non interactive mode (e.g. not specifying
`-i` or `--interactive`) on the server and with git 2.26 this fails
because it seems that it now runs in interactive mode by default. It
tries to an editor on `git rebase --continue`.
Specifying `-c rebase.backend=apply` fixes our issue see
https://github.com/FredrikNoren/ungit/issues/1301

It would be great if the new merge backend would also support a non
interactive mode e.g. by respecting the `-i` or `--interactive`
option,

Thanks and regards
Bastian Buchholz

Re: Git 2.26 rebase.backend change issue

[Jeff King]

On Sat, Mar 28, 2020 at 09:21:08AM +0100, Bastian Buchholz wrote:

> Just wanted to report that I am running into issues with the git 2.26
> `rebase.backend` change.
> I am a maintainer on https://github.com/FredrikNoren/ungit which is a
> UI for git using a http server / browser architecture.
> We are using `git rebase` in non interactive mode (e.g. not specifying
> `-i` or `--interactive`) on the server and with git 2.26 this fails
> because it seems that it now runs in interactive mode by default. It
> tries to an editor on `git rebase --continue`.
> Specifying `-c rebase.backend=apply` fixes our issue see
> https://github.com/FredrikNoren/ungit/issues/1301

I don't think --interactive is relevant here; the features triggered by
that option (i.e., the ability to tweak the instruction list) are
different from the notion that rebase would never interact with the user
at all.

There's more discussion of this change in the thread at:

  https://lore.kernel.org/git/20200310174017.GA549010@coredump.intra.peff.net/

The simplest fix is likely to set GIT_EDITOR=: in your environment when
you don't want the user to ever be presented with an editor.

-Peff

Re: Git 2.26 rebase.backend change issue

[Bastian Buchholz]

Yes, the issue we have is the same described in the other thread.
I will try using GIT_EDITOR=: instead.

Thanks!


On Sat, Mar 28, 2020 at 3:18 PM Jeff King <peff@peff.net> wrote:
>
> On Sat, Mar 28, 2020 at 09:21:08AM +0100, Bastian Buchholz wrote:
>
> > Just wanted to report that I am running into issues with the git 2.26
> > `rebase.backend` change.
> > I am a maintainer on https://github.com/FredrikNoren/ungit which is a
> > UI for git using a http server / browser architecture.
> > We are using `git rebase` in non interactive mode (e.g. not specifying
> > `-i` or `--interactive`) on the server and with git 2.26 this fails
> > because it seems that it now runs in interactive mode by default. It
> > tries to an editor on `git rebase --continue`.
> > Specifying `-c rebase.backend=apply` fixes our issue see
> > https://github.com/FredrikNoren/ungit/issues/1301
>
> I don't think --interactive is relevant here; the features triggered by
> that option (i.e., the ability to tweak the instruction list) are
> different from the notion that rebase would never interact with the user
> at all.
>
> There's more discussion of this change in the thread at:
>
>   https://lore.kernel.org/git/20200310174017.GA549010@coredump.intra.peff.net/
>
> The simplest fix is likely to set GIT_EDITOR=: in your environment when
> you don't want the user to ever be presented with an editor.
>
> -Peff