Skip to content

Commit b832abb

Browse files
Martin Ågrengitster
authored andcommitted
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 65807ee ("builtin-config: Fix crash when using "-f <relative path>" from non-root dir", 2010-01-26), then another, using `GIT_CONFIG`, came about in 270a344 ("config: stop using config_exclusive_filename", 2012-02-16). The latter of these was then converted to use `--file` in f7e8714 ("t: prefer "git config --file" to GIT_CONFIG", 2014-03-20). Both where then simplified in a5db0b7 ("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 f7e8714, we do still have a test for `GIT_CONFIG` and it shares the implementation with `--file`. Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 71ca53e commit b832abb

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

t/t1300-config.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,6 @@ test_expect_success 'editing stdin is an error' '
506506

507507
test_expect_success 'refer config from subdirectory' '
508508
mkdir x &&
509-
test_cmp_config -C x strasse --get --file ../other-config ein.bahn
510-
'
511-
512-
test_expect_success 'refer config from subdirectory via --file' '
513509
test_cmp_config -C x strasse --file=../other-config --get ein.bahn
514510
'
515511

0 commit comments

Comments
 (0)