diff options
| author |  Martin Ågren <martin.agren@gmail.com> | 2021-01-03 10:36:46 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-04 11:31:24 -0800 |
| commit | b832abb63dfb54925a52f48b85e3021116d331e8 (patch) | |
| tree | e96287869c4038c82afa5d47570c224168bdd051 /t | |
| parent | Git 2.30 (diff) | |
| download | tgif-b832abb63dfb54925a52f48b85e3021116d331e8.tar.xz | |
t1300: remove duplicate test for `--file ../foo`
We have two tests for checking that we can handle `git config --file
../other-config ...`. One, using `--file`, was introduced in 65807ee697
("builtin-config: Fix crash when using "-f <relative path>" from
non-root dir", 2010-01-26), then another, using `GIT_CONFIG`, came about
in 270a34438b ("config: stop using config_exclusive_filename",
2012-02-16).
The latter of these was then converted to use `--file` in f7e8714101
("t: prefer "git config --file" to GIT_CONFIG", 2014-03-20). Both where
then simplified in a5db0b77b9 ("t1300: extract and use
test_cmp_config()", 2018-10-21).
These two tests differ slightly in the order of the options used, but
other than that, they are identical. Let's drop one. As noted in
f7e8714101, we do still have a test for `GIT_CONFIG` and it shares the
implementation with `--file`.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1300-config.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 97a04c6cc2..302821fb02 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -506,10 +506,6 @@ test_expect_success 'editing stdin is an error' ' test_expect_success 'refer config from subdirectory' ' mkdir x && - test_cmp_config -C x strasse --get --file ../other-config ein.bahn -' - -test_expect_success 'refer config from subdirectory via --file' ' test_cmp_config -C x strasse --file=../other-config --get ein.bahn ' |