diff options
| author |  Brandon Williams <bmwill@google.com> | 2017-07-25 14:39:14 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-02 14:35:08 -0700 |
| commit | 5ea50954d0632342d38bd1a4d86c5aa601ef5207 (patch) | |
| tree | b1a1a625c02e243f850d9d609812a93522913725 | |
| parent | Merge branch 'bc/object-id' into bw/submodule-config-cleanup (diff) | |
| download | tgif-5ea50954d0632342d38bd1a4d86c5aa601ef5207.tar.xz | |
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>
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 10 | ||||
| -rwxr-xr-x | t/t7411-submodule-config.sh | 15 |
2 files changed, 15 insertions, 10 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index dcac364c5f..717447526e 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -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 && ( diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh index eea36f1dbe..7d6b25ba23 100755 --- a/t/t7411-submodule-config.sh +++ b/t/t7411-submodule-config.sh @@ -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' |