git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/3] t1300: remove duplicate test for `--file ../foo`

From
MÅMartin Ågren <martin.agren@gmail.com>
Date
Jan 3, 2021, 09:36 UTC
Message-ID
<20210103093649.2221-2-martin.agren@gmail.com>
In-Reply-To
<20210103093649.2221-1-martin.agren@gmail.com>

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>
---
 t/t1300-config.sh | 4 ----
 1 file changed, 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
 '
 
-- 
2.30.0
Previous: Martin ÅgrenNext: Martin Ågren
Message 2 of 5 in “t1300: minor cleanups”
  1. 0/3 t1300: minor cleanupsMartin Ågren, Jan 3, 2021
  2. 1/3 t1300: remove duplicate test for `--file ../foo`Martin Ågren, Jan 3, 2021
  3. 2/3 t1300: remove duplicate test for `--file no-such-file`Martin Ågren, Jan 3, 2021
  4. 3/3 t1300: don't needlessly work with `core.foo` configsMartin Ågren, Jan 3, 2021
  5. Junio C HamanoJan 6, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.