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 5/6] t7006: demonstrate a problem with aliases in subdirectories
Date: Wed, 14 Jun 2017 13:35:56 +0200 (CEST) [thread overview]
Message-ID: <ba1ae3d6cc5c1722d00480267cfa9b4946c0c0ea.1497440104.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1497440104.git.johannes.schindelin@gmx.de>
When expanding aliases, the git_dir is set during the alias expansion
(by virtue of running setup_git_directory_gently()).
This git_dir may be relative to the current working directory, and
indeed often is simply ".git/".
When the alias expands to a shell command, we restore the original
working directory, though, yet we do not reset git_dir.
As a consequence, subsequent read_early_config() runs will mistake the
git_dir to be populated properly and not find the correct config.
Demonstrate this problem by adding a test case.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
| 11 +++++++++++
1 file changed, 11 insertions(+)
--git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 4f3794d415e..83881ec3a0c 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -391,6 +391,17 @@ test_expect_success TTY 'core.pager in repo config works and retains cwd' '
)
'
+test_expect_failure TTY 'core.pager is found via alias in subdirectory' '
+ sane_unset GIT_PAGER &&
+ test_config core.pager "cat >via-alias" &&
+ (
+ cd sub &&
+ rm -f via-alias &&
+ test_terminal git -c alias.r="-p rev-parse" r HEAD &&
+ test_path_is_file via-alias
+ )
+'
+
test_doesnt_paginate expect_failure test_must_fail 'git -p nonsense'
test_pager_choices 'git shortlog'
--
2.13.1.windows.1.1.ga36e14b3aaa
next prev 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 ` [PATCH v4 4/6] t1308: relax the test verifying that empty alias values are disallowed Johannes Schindelin
2017-06-14 11:35 ` Johannes Schindelin [this message]
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=ba1ae3d6cc5c1722d00480267cfa9b4946c0c0ea.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).