Re: [PATCH] rebase -r: always reword merge -c

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi Phillip,

On Tue, 30 Apr 2019, Phillip Wood wrote:

> On 29/04/2019 17:14, Johannes Schindelin wrote:
> > Hi Phillip,
> >
> > On Fri, 26 Apr 2019, Phillip Wood wrote:
> >
> > >     ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
> > >              run_commit_flags);
> > >
> > > diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
> > > index 4c69255ee6..3d484a3c72 100755
> > > --- a/t/t3430-rebase-merges.sh
> > > +++ b/t/t3430-rebase-merges.sh
> > > @@ -164,6 +164,16 @@ test_expect_success 'failed `merge <branch>` does not
> > > crash' '
> > >   	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
> > >   '
> > >
> > > +test_expect_success 'fast-forward merge -c still rewords' '
> > > +	git checkout -b fast-forward-merge-c H &&
> > > +	set_fake_editor &&
> >
> > set_fake_editor affects global state AFAIR (setting and exporting
> > `EDITOR`), therefore this would need to be run in a subshell, i.e.
> > enclosed in parentheses.
>
> The other test files are not very consistent about that. I'll re-roll. Note
> that I do not export any FAKE_* variables, so later tests should not be
> affected even if the fake editor runs.

AFAIR I tried my best to avoid `set_fake_editor` altogether and instead
preferred `write_script`/`test_config core.editor` combos in t3430.

Ciao,
Dscho