t7411: check configuration parsing errors
Check for configuration parsing errors in '.gitmodules' in t7411, which is explicitly testing the submodule-config subsystem, instead of in t7400. Also explicitly use the test helper instead of relying on the gitmodules file from being read in status. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a46ddc992b
commit
5ea50954d0
@ -46,16 +46,6 @@ test_expect_success 'submodule update aborts on missing gitmodules url' '
|
||||
test_must_fail git submodule init
|
||||
'
|
||||
|
||||
test_expect_success 'configuration parsing' '
|
||||
test_when_finished "rm -f .gitmodules" &&
|
||||
cat >.gitmodules <<-\EOF &&
|
||||
[submodule "s"]
|
||||
path
|
||||
ignore
|
||||
EOF
|
||||
test_must_fail git status
|
||||
'
|
||||
|
||||
test_expect_success 'setup - repository in init subdirectory' '
|
||||
mkdir init &&
|
||||
(
|
||||
|
@ -31,6 +31,21 @@ test_expect_success 'submodule config cache setup' '
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'configuration parsing with error' '
|
||||
test_when_finished "rm -rf repo" &&
|
||||
test_create_repo repo &&
|
||||
cat >repo/.gitmodules <<-\EOF &&
|
||||
[submodule "s"]
|
||||
path
|
||||
ignore
|
||||
EOF
|
||||
(
|
||||
cd repo &&
|
||||
test_must_fail test-submodule-config "" s 2>actual &&
|
||||
test_i18ngrep "bad config" actual
|
||||
)
|
||||
'
|
||||
|
||||
cat >super/expect <<EOF
|
||||
Submodule name: 'a' for path 'a'
|
||||
Submodule name: 'a' for path 'b'
|
||||
|
Loading…
Reference in New Issue
Block a user