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

[PATCH 5/9] t1308: relax the test verifying that empty alias values are disallowed

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 7, 2017, 16:06 UTC
Message-ID
<3325827e66b1a9e693f81e8aa4cae44f41dfdc25.1496851544.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1496851544.git.johannes.schindelin@gmx.de>

We are about to change the way aliases are expanded, to use the early config machinery.

This machinery reports errors in a slightly different manner than the cached config machinery.

Let's not get hung up by the precise wording of the message mentioning the lin number. It is really sufficient to verify that all the relevant information is given to the user.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t1308-config-set.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index ff50960ccae..69a0aa56d6d 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -215,7 +215,9 @@ test_expect_success 'check line errors for malformed values' '
 		br
 	EOF
 	test_expect_code 128 git br 2>result &&
-	test_i18ngrep "fatal: .*alias\.br.*\.git/config.*line 2" result
+	test_i18ngrep "missing value for .alias\.br" result &&
+	test_i18ngrep "fatal: .*\.git/config" result &&
+	test_i18ngrep "fatal: .*line 2" result
 '
 
 test_expect_success 'error on modifying repo config without repo' '
-- 
2.13.0.windows.1.460.g13f583bedb5
Previous: Johannes SchindelinNext: Brandon Williams
Message 21 of 34 in “Avoid problem where git_dir is set after alias expansion”
  1. 0/9 Avoid problem where git_dir is set after alias expansionJohannes Schindelin, Jun 7, 2017
  2. 1/9 discover_git_directory(): avoid setting invalid git_dirJohannes Schindelin, Jun 7, 2017
  3. Brandon WilliamsJun 7, 2017
  4. Johannes SchindelinJun 8, 2017
  5. 2/9 config: report correct line number upon errorJohannes Schindelin, Jun 7, 2017
  6. Junio C HamanoJun 9, 2017
  7. 3/9 help: use early config when autocorrecting aliasesJohannes Schindelin, Jun 7, 2017
  8. Brandon WilliamsJun 7, 2017
  9. Johannes SchindelinJun 8, 2017
  10. Junio C HamanoJun 9, 2017
  11. 4/9 read_early_config(): optionally return the worktree's top-level directoryJohannes Schindelin, Jun 7, 2017
  12. Brandon WilliamsJun 7, 2017
  13. Johannes SchindelinJun 8, 2017
  14. Brandon WilliamsJun 8, 2017
  15. Johannes SchindelinJun 8, 2017
  16. Brandon WilliamsJun 8, 2017
  17. Johannes SchindelinJun 8, 2017
  18. Brandon WilliamsJun 8, 2017
  19. 7/9 alias_lookup(): optionally return top-level directoryJohannes Schindelin, Jun 7, 2017
  20. 6/9 t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin, Jun 7, 2017
  21. 5/9 t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin, Jun 7, 2017
  22. Brandon WilliamsJun 7, 2017
  23. Johannes SchindelinJun 8, 2017
  24. Brandon WilliamsJun 8, 2017
  25. Junio C HamanoJun 10, 2017
  26. 8/9 Use the early config machinery to expand aliasesJohannes Schindelin, Jun 7, 2017
  27. Brandon WilliamsJun 7, 2017
  28. Johannes SchindelinJun 8, 2017
  29. Brandon WilliamsJun 8, 2017
  30. Junio C HamanoJun 10, 2017
  31. Johannes SchindelinJun 7, 2017
  32. Brandon WilliamsJun 7, 2017
  33. Johannes SchindelinJun 8, 2017
  34. Brandon WilliamsJun 8, 2017

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.