From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v2 0/9] allow customizing /etc/gitconfig location with an environment
Date: Thu, 29 Sep 2016 14:00:05 -0700 [thread overview]
Message-ID: <20160929210014.3874-1-gitster@pobox.com> (raw)
This ended up growing quite a bit, and I mostly hate it.
- Patch 1 introduces GIT_CONFIG_SYSTEM_PATH environment variable
that lets you point at a file other than /etc/gitconfig to
pretend that your file is the system-wide configuration.
- Patch 2 is a small bugfix.
- Patches 3-7 are updates to 1300 and 1308, i.e. tests for "git
config", to make them more robust, in preparation for using
GIT_CONFIG_SYSTEM_PATH mechanism to point at a file during the
test. It protects them a bit more than necessary in that the
variables some of the tests they use when they try to see the
output from "git config --get" are unlikely to appear in the fake
system-wide configuration during the test (hence disabling the
fake system-wide configuration has no practical effect), but
nevertheless the calls are protected by explicitly telling them
to read only from --local configuration file to future-proof
them.
- Patch 8 is queued elsewhere already.
- Patch 9 raises the default core.abbrev to 12 and countermands it
by setting it to 7 in a fake system-wide configuration file
during our test. The unconditional widening of the default
abbreviation size in this patch will have to be discarded,
preferring the approach Linus is taking to auto-size it based on
the number of objects in the repository, but the part that
updates the test script may still be necessary.
Jeff King (1):
t1300: check also system-wide configuration file in --show-origin
tests
Junio C Hamano (8):
config: allow customizing /etc/gitconfig location with an environment
t1300: always compare expect to actual
t1308: ignore system-wide config in the iteration test
t1300: disable system-wide config for tests that wants to read from -c
t1300: take contents of system-wide configuration into account in
"--list" test
t1300: be explicit in local configuration tests
worktree: honor configuration variables
core.abbrev: raise the default abbreviation to 12 hexdigits
builtin/worktree.c | 2 +
cache.h | 1 +
config.c | 2 +
environment.c | 2 +-
t/gitconfig-for-test | 9 ++++
t/t1300-repo-config.sh | 120 ++++++++++++++++++++++++++++++-------------------
t/t1308-config-set.sh | 1 +
t/test-lib.sh | 4 +-
8 files changed, 93 insertions(+), 48 deletions(-)
create mode 100644 t/gitconfig-for-test
--
2.10.0-589-g5adf4e1
next reply other threads:[~2016-09-29 21:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-29 21:00 Junio C Hamano [this message]
2016-09-29 21:00 ` [PATCH v2 1/9] config: allow customizing /etc/gitconfig location with an environment Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 2/9] t1300: always compare expect to actual Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 3/9] t1308: ignore system-wide config in the iteration test Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 4/9] t1300: check also system-wide configuration file in --show-origin tests Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 5/9] t1300: disable system-wide config for tests that wants to read from -c Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 6/9] t1300: take contents of system-wide configuration into account in "--list" test Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 7/9] t1300: be explicit in local configuration tests Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 8/9] worktree: honor configuration variables Junio C Hamano
2016-09-29 21:00 ` [PATCH v2 9/9] core.abbrev: raise the default abbreviation to 12 hexdigits Junio C Hamano
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=20160929210014.3874-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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).