diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2021-01-03 12:36:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-04 22:31:25 +0300 |
| commit | 34479d717756bd363280ac65bfd71569d954f74b (patch) | |
| tree | 10ba293262c8729b7ad045c6aab2efbb2da53972 /t/t1300-config.sh | |
| parent | b832abb63dfb54925a52f48b85e3021116d331e8 (diff) | |
t1300: remove duplicate test for `--file no-such-file`
We test that we can handle `git config --file symlink` and the error
case of `git config --file symlink-to-missing-file`. For good measure,
we also throw in a test to check that we correctly handle referencing a
missing regular file. But we have such a test earlier in this script.
They both check that we fail to use `--file no-such-file --list`.
Drop the latter of these and keep the one that is in the general area
where we test `--file` and `GIT_CONFIG`. The one we're dropping also
checks that we can't even get a specific key from the missing file --
let's make sure we check that in the test we keep.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1300-config.sh')
| -rwxr-xr-x | t/t1300-config.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 302821fb02..1439d870d6 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -469,7 +469,8 @@ test_expect_success 'new variable inserts into proper section' ' ' test_expect_success 'alternative --file (non-existing file should fail)' ' - test_must_fail git config --file non-existing-config -l + test_must_fail git config --file non-existing-config -l && + test_must_fail git config --file non-existing-config test.xyzzy ' cat > other-config << EOF @@ -1032,11 +1033,6 @@ test_expect_success SYMLINKS 'symlinked configuration' ' test_cmp expect actual ' -test_expect_success 'nonexistent configuration' ' - test_must_fail git config --file=doesnotexist --list && - test_must_fail git config --file=doesnotexist test.xyzzy -' - test_expect_success SYMLINKS 'symlink to nonexistent configuration' ' ln -s doesnotexist linktonada && ln -s linktonada linktolinktonada && |