On Mon, May 14, 2018 at 3:58 AM, Antonio Ospite <ao2@xxxxxx> wrote: > Tests 5 and 8 in t/t7411-submodule-config.sh add two commits with > invalid lines in .gitmodules but then only the second commit is removed. > > This may affect subsequent tests if they assume that the .gitmodules > file has no errors. > > Since those commits are not needed anymore remove both of them. > > Signed-off-by: Antonio Ospite <ao2@xxxxxx> > --- > > I am putting these fixups to the test-suite before the patch that actually > needs them so that the test-suite passes after each commit. > > t/t7411-submodule-config.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh > index 0bde5850a..a648de6a9 100755 > --- a/t/t7411-submodule-config.sh > +++ b/t/t7411-submodule-config.sh > @@ -135,7 +135,7 @@ test_expect_success 'error in history in fetchrecursesubmodule lets continue' ' > HEAD submodule \ > >actual && > test_cmp expect_error actual && > - git reset --hard HEAD^ > + git reset --hard HEAD~2 > ) > ' As this is the last test in this file, we do not change any subsequent tests in a subtle way. Good! This is Reviewed-by: Stefan Beller <sbeller@xxxxxxxxxx> FYI: This test -- of course -- doesn't quite follow the latest coding guidelines, as usually we'd prefer a test_when_finished "<cmd to restore>" at the beginning of a test.
