Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh > index e0d910c229..b8ba323dbc 100755 > --- a/t/t3430-rebase-merges.sh > +++ b/t/t3430-rebase-merges.sh > @@ -293,6 +293,12 @@ test_expect_success 'do not rebase cousins unless asked for' ' > EOF > ' > > +test_expect_success '--rebase-merges="" is invalid syntax' ' > + echo "fatal: Unknown mode: " >expect && > + ! git rebase --rebase-merges="" HEAD^ 2>actual && "!" takes any non-zero exit, even a segfaulting "git". Let's use test_must_fail to make sure it dies in a controlled way, i.e. test_must_fail git rebase --rebase-merges="" HEAD^ 2>actual && > + test_cmp expect actual > +' > + > test_expect_success 'refs/rewritten/* is worktree-local' ' > git worktree add wt && > cat >wt/script-from-scratch <<-\EOF && Other than that, looking good. Thanks.
