David Turner <dturner@xxxxxxxxxxxx> writes: > diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh > index 470f334..be074a1 100755 > --- a/t/t3030-merge-recursive.sh > +++ b/t/t3030-merge-recursive.sh > @@ -575,13 +575,13 @@ test_expect_success 'merge removes empty directories' ' > test_must_fail test -d d > ' > > -test_expect_failure 'merge-recursive simple w/submodule' ' > +test_expect_success 'merge-recursive simple w/submodule' ' > > git checkout submod && > git merge remove > ' > > -test_expect_failure 'merge-recursive simple w/submodule result' ' > +test_expect_sucess 'merge-recursive simple w/submodule result' ' Here is a typo. I wonder if we want to do "set -e" at the end of test-lib.sh to catch a breakage like this. I only caught it by being lucky (I was staring "make test" output as it flew by). I've already amended the copy I have, but in case you are going to reroll in the future, please do not forget to update your copy.