Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 89690b7adb85a9dbcda4fe85c5ab672716f41de8..ad28e9388053c4009f4af3121788951f9e79d848 100755 (executable)
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -142,6 +142,15 @@ test_expect_success 'reading submodules config from the working tree with "submo
        )
 '
 
+test_expect_success 'unsetting submodules config from the working tree with "submodule--helper config --unset"' '
+       (cd super &&
+               git submodule--helper config --unset submodule.submodule.url &&
+               git submodule--helper config submodule.submodule.url >actual &&
+               test_must_be_empty actual
+       )
+'
+
+
 test_expect_success 'writing submodules config with "submodule--helper config"' '
        (cd super &&
                echo "new_url" >expect &&
@@ -234,18 +243,14 @@ test_expect_success 'reading nested submodules config' '
        )
 '
 
-# When this test eventually passes, before turning it into
-# test_expect_success, remember to replace the test_i18ngrep below with
-# a "test_must_be_empty warning" to be sure that the warning is actually
-# removed from the code.
-test_expect_failure 'reading nested submodules config when .gitmodules is not in the working tree' '
+test_expect_success 'reading nested submodules config when .gitmodules is not in the working tree' '
        test_when_finished "git -C super/submodule checkout .gitmodules" &&
        (cd super &&
                echo "./nested_submodule" >expect &&
                rm submodule/.gitmodules &&
                test-tool submodule-nested-repo-config \
                        submodule submodule.nested_submodule.url >actual 2>warning &&
-               test_i18ngrep "nested submodules without %s in the working tree are not supported yet" warning &&
+               test_must_be_empty warning &&
                test_cmp expect actual
        )
 '