Merge branch 'av/wincred-with-at-in-username-fix' into maint

diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh
index 450d26136a0555822703ff4deb9ff3bb1326936c..0ba8194403f6740807cbd63d1bda8a69091e3d6b 100755 (executable)
--- a/t/t4255-am-submodule.sh
+++ b/t/t4255-am-submodule.sh
@@ -80,12 +80,12 @@ test_expect_success 'diff.submodule unset with extra file' '
        run_test $THIRD second-submodule
 '
 
-test_expect_failure 'diff.submodule=log' '
+test_expect_success 'diff.submodule=log' '
        test_config diff.submodule log &&
        run_test $SECOND first-submodule
 '
 
-test_expect_failure 'diff.submodule=log with extra file' '
+test_expect_success 'diff.submodule=log with extra file' '
        test_config diff.submodule log &&
        run_test $THIRD second-submodule
 '