On Thu, Apr 08 2021, Sergey Organov wrote: > There were 3 completion tests failures due to introduction of > log.diffMerges configuration variable that affected the result of > completion of log.d. Fixed them accordingly. > > Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> > --- > t/t9902-completion.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > index 04ce884ef5ac..4d732d6d4f81 100755 > --- a/t/t9902-completion.sh > +++ b/t/t9902-completion.sh > @@ -2306,6 +2306,7 @@ test_expect_success 'git config - variable name' ' > test_completion "git config log.d" <<-\EOF > log.date Z > log.decorate Z > + log.diffMerges Z > EOF > ' > > @@ -2327,6 +2328,7 @@ test_expect_success 'git -c - variable name' ' > test_completion "git -c log.d" <<-\EOF > log.date=Z > log.decorate=Z > + log.diffMerges=Z > EOF > ' > > @@ -2348,6 +2350,7 @@ test_expect_success 'git clone --config= - variable name' ' > test_completion "git clone --config=log.d" <<-\EOF > log.date=Z > log.decorate=Z > + log.diffMerges=Z > EOF > ' Commits should be made in such a way as to not break the build/tests partway through a series, which it seems is happening until this fixup. Having read this far most of what you have in this 9 patch series could/should be squashed into something much smaller, e.g. tests being added for code added in previous steps, let's add the tests along with the code since this isn't such a large change.
