On Wed, Jul 14, 2021 at 10:00 PM Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > > On Wed, Jul 14, 2021 at 10:41 PM Elijah Newren via GitGitGadget > <gitgitgadget@xxxxxxxxx> wrote: > > The --rebase[=...] flags and the various ff flags are incompatible, > > except that --no-rebase (or --rebase=false) work with any of the ff > > flags, and --ff works with any of the rebase flags. > > [...] > > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > > --- > > diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh > > +test_expect_success 'report conflicting configuration' ' > > + git reset --hard c2 && > > + test_must_fail git -c pull.ff=false -c pull.rebase=true pull . c1 2>err && > > + test_i18ngrep "pull.rebase and pull.ff are incompatible; please unset one" err > > + > > +' > > nit: unnecessary and inconsistent blank line at end of test Good catch, will fix (assuming the relevant folks agree with my general --ff-only & --no-ff vs. --rebase handling approach).
