From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 3/4] tests: local config file should be honored from subdirs of toplevel
Date: Sat, 26 Jun 2010 14:25:37 -0500 [thread overview]
Message-ID: <20100626192537.GC20051@burratino> (raw)
In-Reply-To: <20100626192203.GA19973@burratino>
When git is passed the --paginate option, starting up a pager requires
deciding what pager to start, which requires access to the core.pager
configuration. If --paginate is handled before searching for the
git dir, this configuration will be missed.
In other words, with --paginate and only with --paginate, any
repository-local core.pager setting is being ignored [*].
[*] unless the git directory is ./.git or GIT_DIR or GIT_CONFIG was
set explicitly.
Add a test to demonstrate this counterintuitive behavior. Noticed
while reading over a patch by Duy that fixes it.
Cc: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Improved-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
| 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
--git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 4420f91..2b106be 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -259,6 +259,28 @@ test_core_pager_overrides() {
"
}
+test_core_pager_subdir() {
+ parse_args "$@"
+
+ $test_expectation TTY "$cmd - core.pager from subdirectory" "
+ unset GIT_PAGER;
+ rm -f core.pager_used &&
+ rm -fr sub ||
+ cleanup_fail &&
+
+ PAGER=wc &&
+ stampname=\$(pwd)/core.pager_used &&
+ export PAGER stampname &&
+ git config core.pager 'wc >\"\$stampname\"' &&
+ mkdir sub &&
+ (
+ cd sub &&
+ $full_command
+ ) &&
+ test -e core.pager_used
+ "
+}
+
test_GIT_PAGER_overrides() {
parse_args "$@"
@@ -277,21 +299,25 @@ test_GIT_PAGER_overrides() {
test_default_pager expect_success 'git log'
test_PAGER_overrides expect_success 'git log'
test_core_pager_overrides expect_success 'git log'
+test_core_pager_subdir expect_success 'git log'
test_GIT_PAGER_overrides expect_success 'git log'
test_default_pager expect_success 'git -p log'
test_PAGER_overrides expect_success 'git -p log'
test_core_pager_overrides expect_success 'git -p log'
+test_core_pager_subdir expect_failure 'git -p log'
test_GIT_PAGER_overrides expect_success 'git -p log'
test_default_pager expect_success test_must_fail 'git -p'
test_PAGER_overrides expect_success test_must_fail 'git -p'
test_core_pager_overrides expect_success test_must_fail 'git -p'
+test_core_pager_subdir expect_failure test_must_fail 'git -p'
test_GIT_PAGER_overrides expect_success test_must_fail 'git -p'
test_default_pager expect_success test_must_fail 'git -p nonsense'
test_PAGER_overrides expect_success test_must_fail 'git -p nonsense'
test_core_pager_overrides expect_success test_must_fail 'git -p nonsense'
+test_core_pager_subdir expect_failure test_must_fail 'git -p nonsense'
test_GIT_PAGER_overrides expect_success test_must_fail 'git -p nonsense'
test_done
--
1.7.1.579.ge2549
next prev parent reply other threads:[~2010-06-26 19:25 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-26 19:22 [PATCH 0/4] git --paginate: do not commit pager choice too early Jonathan Nieder
2010-06-26 19:23 ` [PATCH 1/4] t7006 (pager): introduce helper for parameterized tests Jonathan Nieder
2010-06-26 19:24 ` [PATCH 2/4] t7006: test pager configuration for several git commands Jonathan Nieder
2010-06-26 19:28 ` Jonathan Nieder
2010-06-26 19:25 ` Jonathan Nieder [this message]
2010-06-26 19:26 ` [PATCH 4/4] git --paginate: do not commit pager choice too early Jonathan Nieder
2010-06-28 9:40 ` [PATCH 0/4] " Jeff King
2010-06-28 10:13 ` Jonathan Nieder
2010-06-28 10:22 ` Jeff King
2010-06-28 12:45 ` Nguyen Thai Ngoc Duy
2010-06-29 5:42 ` Junio C Hamano
2010-07-14 20:36 ` Junio C Hamano
2010-07-14 21:30 ` Jonathan Nieder
2010-07-14 22:55 ` [PATCH] git --paginate: paginate external commands again Jonathan Nieder
2010-07-18 12:27 ` [PATCH 0/4] git --paginate: do not commit pager choice too early Nguyen Thai Ngoc Duy
2010-08-06 2:35 ` [PATCH jn/paginate-fix 0/12] " Jonathan Nieder
2010-08-06 2:40 ` [PATCH 01/12] git wrapper: introduce startup_info struct Jonathan Nieder
2010-08-06 2:46 ` [PATCH 02/12] setup: remember whether repository was found Jonathan Nieder
2010-08-06 2:52 ` [PATCH 03/12] git wrapper: allow setup_git_directory_gently() be called earlier Jonathan Nieder
2010-08-06 3:01 ` [PATCH 04/12] shortlog: run setup_git_directory_gently() sooner Jonathan Nieder
2010-08-06 3:06 ` [PATCH 05/12] grep: " Jonathan Nieder
2010-08-06 3:08 ` [PATCH 06/12] apply: " Jonathan Nieder
2010-08-15 20:13 ` Ævar Arnfjörð Bjarmason
2010-08-15 22:34 ` Nguyen Thai Ngoc Duy
2010-08-15 23:11 ` Jonathan Nieder
2010-08-16 0:36 ` [PATCH 06/12 v2] " Nguyễn Thái Ngọc Duy
2010-08-16 3:39 ` Junio C Hamano
2010-08-06 3:12 ` [PATCH 07/12] bundle: " Jonathan Nieder
2010-08-16 7:21 ` Thomas Rast
2010-08-16 8:07 ` Jonathan Nieder
2010-08-16 8:11 ` [PATCH 2/2] t7006 (pager): add missing TTY prerequisite Jonathan Nieder
2010-08-16 16:41 ` Junio C Hamano
2010-08-06 3:15 ` [PATCH 08/12] config: run setup_git_directory_gently() sooner Jonathan Nieder
2010-08-06 3:18 ` [PATCH 09/12] index-pack: " Jonathan Nieder
2010-08-06 3:20 ` [PATCH 10/12] ls-remote: " Jonathan Nieder
2010-08-06 3:21 ` [PATCH 11/12] var: " Jonathan Nieder
2010-08-06 3:27 ` [PATCH 12/12] merge-file: " Jonathan Nieder
2010-08-06 3:34 ` [PATCH master 0/2] fix "check-ref-format --branch" from subdir of toplevel Jonathan Nieder
2010-08-06 3:36 ` [PATCH 1/2] check-ref-format: handle subcommands in separate functions Jonathan Nieder
2010-08-06 3:39 ` [PATCH 2/2] Allow "check-ref-format --branch" from subdirectory Jonathan Nieder
2010-08-06 19:42 ` Junio C Hamano
2010-08-06 4:26 ` [PATCH jn/paginate-fix 0/12] Re: git --paginate: do not commit pager choice too early Nguyen Thai Ngoc Duy
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100626192537.GC20051@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.