undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7411: check configuration parsing errors

Browse Source 
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:
Brandon Williams 2017-07-25 14:39:14 -07:00 committed by Junio C Hamano
parent a46ddc992b
commit 5ea50954d0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7400-submodule-basic.sh
View File

@ -46,16 +46,6 @@ test_expect_success 'submodule update aborts on missing gitmodules url' '
test_must_fail git submodule init 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' ' test_expect_success 'setup - repository in init subdirectory' '
mkdir init && mkdir init &&
( (

15
t/t7411-submodule-config.sh
View File

@ -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 cat >super/expect <<EOF
Submodule name: 'a' for path 'a' Submodule name: 'a' for path 'a'
Submodule name: 'a' for path 'b' Submodule name: 'a' for path 'b'