git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Brandon Williams <bmwill@google.com>
Subject: [PATCH v4 4/6] t1308: relax the test verifying that empty alias values are disallowed
Date: Wed, 14 Jun 2017 13:35:53 +0200 (CEST)	[thread overview]
Message-ID: <2c480fe5c160c560b501b6190a95154ef6b19ba7.1497440104.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1497440104.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 line 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 e495a616161..bafed5c9b88 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -226,7 +226,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.1.windows.1.1.ga36e14b3aaa



  parent reply	other threads:[~2017-06-14 11:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-14 11:35 [PATCH v4 0/6] Avoid problem where git_dir is set after alias expansion Johannes Schindelin
2017-06-14 11:35 ` [PATCH v4 1/6] discover_git_directory(): avoid setting invalid git_dir Johannes Schindelin
2017-06-14 11:35 ` [PATCH v4 2/6] config: report correct line number upon error Johannes Schindelin
2017-06-14 11:35 ` [PATCH v4 3/6] help: use early config when autocorrecting aliases Johannes Schindelin
2017-06-14 11:35 ` Johannes Schindelin [this message]
2017-06-14 11:35 ` [PATCH v4 5/6] t7006: demonstrate a problem with aliases in subdirectories Johannes Schindelin
2017-06-14 11:36 ` [PATCH v4 6/6] Use the early config machinery to expand aliases Johannes Schindelin
2017-06-15 19:36   ` Junio C Hamano
2017-06-15 19:44     ` Johannes Schindelin
2017-06-15  6:37 ` [PATCH v4 0/6] Avoid problem where git_dir is set after alias expansion Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2c480fe5c160c560b501b6190a95154ef6b19ba7.1497440104.git.johannes.schindelin@gmx.de \
    --to=johannes.schindelin@gmx.de \
    --cc=bmwill@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).