From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: peff@peff.net, torvalds@linux-foundation.org
Subject: [PATCH 1/4] config: allow customizing /etc/gitconfig location
Date: Wed, 28 Sep 2016 16:30:44 -0700 [thread overview]
Message-ID: <20160928233047.14313-2-gitster@pobox.com> (raw)
In-Reply-To: <20160928233047.14313-1-gitster@pobox.com>
With a new environment variable GIT_ETC_GITCONFIG, the users can
specify a file that is used instead of /etc/gitconfig to read (and
write) the system-wide configuration.
Earlier, we introduced GIT_CONFIG_NOSYSTEM environment variable
ab88c363 ("allow suppressing of global and system config",
2008-02-06), primarily to protect our tests from random set of
configuration variables the system administrators would put in their
/etc/gitconfig file. We can replace the use of this mechanism in
our tests by pointing GIT_ETC_GITCONFIG at our own instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* The next step is to add "[core]abbrev=7" to this file and update
default_abbrev to 12 in environment.c and see what breaks. I
suspect that "git worktree list" would break without my recent
patch. I also know some tests expect "git config -l" to show
only values they set to their local configuration, which would
need to be corrected. We'll see them in next steps.
cache.h | 1 +
config.c | 2 ++
t/gitconfig-for-test | 6 ++++++
t/t1300-repo-config.sh | 15 +++++++++++++++
t/test-lib.sh | 4 ++--
5 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 t/gitconfig-for-test
diff --git a/cache.h b/cache.h
index b0dae4b..81a07bf 100644
--- a/cache.h
+++ b/cache.h
@@ -408,6 +408,7 @@ static inline enum object_type object_type(unsigned int mode)
#define GIT_NAMESPACE_ENVIRONMENT "GIT_NAMESPACE"
#define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
#define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX"
+#define GIT_ETC_GITCONFIG_ENVIRONMENT "GIT_ETC_GITCONFIG"
#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
diff --git a/config.c b/config.c
index 0dfed68..124699b 100644
--- a/config.c
+++ b/config.c
@@ -1253,6 +1253,8 @@ const char *git_etc_gitconfig(void)
{
static const char *system_wide;
if (!system_wide)
+ system_wide = getenv(GIT_ETC_GITCONFIG_ENVIRONMENT);
+ if (!system_wide)
system_wide = system_path(ETC_GITCONFIG);
return system_wide;
}
diff --git a/t/gitconfig-for-test b/t/gitconfig-for-test
new file mode 100644
index 0000000..4598885
--- /dev/null
+++ b/t/gitconfig-for-test
@@ -0,0 +1,6 @@
+;; This file is used as if it were /etc/gitconfig while running the
+;; test scripts in this directory.
+;;
+;; [user]
+;; name = A U Thor
+;; email = author@example.com
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 923bfc5..1184f43 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1372,4 +1372,19 @@ test_expect_success !MINGW '--show-origin blob ref' '
test_cmp expect output
'
+test_expect_success 'system-wide configuration' '
+ system="$TRASH_DIRECTORY/system-wide" &&
+ >"$system" &&
+ git config -f "$system" --add frotz.nitfol xyzzy &&
+
+ git config -f "$system" frotz.nitfol >expect &&
+ GIT_ETC_GITCONFIG="$system" \
+ git config --system frotz.nitfol >actual &&
+
+ GIT_ETC_GITCONFIG="$system" \
+ git config --system --replace-all frotz.nitfol blorb &&
+ echo blorb >expect &&
+ GIT_ETC_GITCONFIG="$system" git config --system frotz.nitfol >actual
+'
+
test_done
diff --git a/t/test-lib.sh b/t/test-lib.sh
index ac56512..6803212 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -851,9 +851,9 @@ else # normal case, use ../bin-wrappers only unless $with_dashes:
fi
fi
GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
-GIT_CONFIG_NOSYSTEM=1
+GIT_ETC_GITCONFIG="$GIT_BUILD_DIR/t/gitconfig-for-test"
GIT_ATTR_NOSYSTEM=1
-export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM
+export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_ETC_GITCONFIG GIT_ATTR_NOSYSTEM
if test -z "$GIT_TEST_CMP"
then
--
2.10.0-584-gc9e068c
next prev parent reply other threads:[~2016-09-28 23:35 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 1:39 Changing the default for "core.abbrev"? Linus Torvalds
2016-09-26 3:46 ` Junio C Hamano
2016-09-26 4:34 ` Jeff King
2016-09-26 4:45 ` Junio C Hamano
2016-09-26 11:57 ` [PATCH 0/10] helping people resolve ambiguous sha1s Jeff King
2016-09-26 11:59 ` [PATCH 01/10] get_sha1: detect buggy calls with multiple disambiguators Jeff King
2016-09-26 16:37 ` Junio C Hamano
2016-09-26 17:21 ` Jeff King
2016-09-26 17:50 ` Junio C Hamano
2016-09-26 11:59 ` [PATCH 02/10] get_sha1: avoid repeating ourselves via ONLY_TO_DIE Jeff King
2016-09-26 11:59 ` [PATCH 03/10] get_sha1: propagate flags to child functions Jeff King
2016-09-26 11:59 ` [PATCH 04/10] get_short_sha1: peel tags when looking for treeish Jeff King
2016-09-26 12:11 ` Jeff King
2016-09-26 16:55 ` Junio C Hamano
2016-09-26 17:23 ` Jeff King
2016-09-26 12:00 ` [PATCH 05/10] get_short_sha1: refactor init of disambiguation code Jeff King
2016-09-26 12:00 ` [PATCH 06/10] get_short_sha1: NUL-terminate hex prefix Jeff King
2016-09-26 17:10 ` Junio C Hamano
2016-09-26 17:25 ` Jeff King
2016-09-26 17:36 ` Junio C Hamano
2016-09-26 12:00 ` [PATCH 07/10] get_short_sha1: mark ambiguity error for translation Jeff King
2016-09-26 12:00 ` [PATCH 08/10] sha1_array: let callbacks interrupt iteration Jeff King
2016-09-26 12:00 ` [PATCH 09/10] for_each_abbrev: drop duplicate objects Jeff King
2016-09-26 12:00 ` [PATCH 10/10] get_short_sha1: list ambiguous objects on error Jeff King
2016-09-26 16:36 ` Linus Torvalds
2016-09-27 5:42 ` Jacob Keller
2016-09-27 12:38 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-29 13:24 ` Jeff King
2016-09-29 14:36 ` Kyle J. McKay
2016-09-29 14:55 ` Jeff King
2016-09-26 17:30 ` Junio C Hamano
2016-09-26 17:34 ` Jeff King
2016-09-26 17:39 ` Junio C Hamano
2016-09-29 11:46 ` Kyle J. McKay
2016-09-29 13:03 ` Jeff King
2016-09-29 17:19 ` Junio C Hamano
2016-09-30 5:51 ` Jacob Keller
2019-02-04 16:12 ` [RFC/PATCH] core.abbrev doc: document and test the abbreviation length Ævar Arnfjörð Bjarmason
2019-02-04 19:13 ` Junio C Hamano
2019-02-04 20:04 ` Junio C Hamano
2019-02-04 21:36 ` Ævar Arnfjörð Bjarmason
2019-02-04 23:32 ` Jeff King
2019-02-04 23:50 ` Ævar Arnfjörð Bjarmason
2019-02-06 18:29 ` Jeff King
2019-02-06 18:36 ` Ævar Arnfjörð Bjarmason
2016-09-26 6:33 ` Changing the default for "core.abbrev"? Matthieu Moy
2016-09-26 12:09 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-26 7:13 ` Christian Couder
2016-09-28 23:30 ` [PATCH 0/4] raising core.abbrev default to 12 hexdigits Junio C Hamano
2016-09-28 23:30 ` Junio C Hamano [this message]
2016-09-29 9:53 ` [PATCH 1/4] config: allow customizing /etc/gitconfig location Jakub Narębski
2016-09-29 17:20 ` Junio C Hamano
2016-09-29 17:45 ` Matthieu Moy
2016-09-28 23:30 ` [PATCH 2/4] t13xx: do not assume system config is empty Junio C Hamano
2016-09-29 9:01 ` Jeff King
2016-09-29 18:13 ` Junio C Hamano
2016-09-29 18:26 ` Jeff King
2016-09-29 18:57 ` Junio C Hamano
2016-09-29 19:18 ` Jeff King
2016-09-29 19:57 ` Junio C Hamano
2016-09-29 19:06 ` Junio C Hamano
2016-09-29 19:26 ` Jeff King
2016-09-29 21:03 ` Junio C Hamano
2016-09-29 21:08 ` Jeff King
2016-09-28 23:30 ` [PATCH 3/4] worktree: honor configuration variables Junio C Hamano
2016-09-28 23:30 ` [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits Junio C Hamano
2016-09-29 2:44 ` SZEDER Gábor
2016-09-29 5:27 ` Lukas Fleischer
2016-09-29 9:22 ` Jeff King
2016-09-29 9:15 ` Jeff King
2016-09-29 10:03 ` Matthieu Moy
2016-09-29 12:52 ` SZEDER Gábor
2016-09-29 5:58 ` Johannes Sixt
2016-09-29 18:05 ` Junio C Hamano
2016-09-29 18:37 ` Linus Torvalds
2016-09-29 18:55 ` Linus Torvalds
2016-09-29 19:06 ` Linus Torvalds
2016-09-29 19:42 ` Junio C Hamano
2016-09-30 0:56 ` Mike Hommey
2016-09-30 1:01 ` Linus Torvalds
2016-09-30 19:41 ` Ævar Arnfjörð Bjarmason
2016-09-29 19:16 ` Jeff King
2016-09-29 19:40 ` Linus Torvalds
2016-09-29 19:45 ` Junio C Hamano
2016-09-29 21:53 ` Linus Torvalds
2016-09-29 23:13 ` Junio C Hamano
2016-09-29 23:20 ` Junio C Hamano
2016-09-30 0:20 ` Linus Torvalds
2016-09-30 0:28 ` Linus Torvalds
2016-09-30 0:57 ` Linus Torvalds
2016-09-30 1:18 ` Linus Torvalds
2016-09-30 3:54 ` Junio C Hamano
2016-09-30 4:10 ` Junio C Hamano
2016-09-30 4:18 ` Linus Torvalds
2016-09-30 4:29 ` Linus Torvalds
2016-09-30 4:27 ` Junio C Hamano
2016-09-30 4:35 ` Junio C Hamano
2016-09-30 18:40 ` Junio C Hamano
2016-09-30 18:51 ` Linus Torvalds
2016-09-30 19:00 ` Junio C Hamano
2016-09-30 4:11 ` Linus Torvalds
2016-09-30 8:06 ` Jeff King
2016-09-30 17:54 ` Linus Torvalds
2016-09-30 18:05 ` Jeff King
2016-09-30 18:21 ` Linus Torvalds
2016-09-30 20:01 ` Junio C Hamano
2016-09-30 17:56 ` Junio C Hamano
2016-09-30 7:47 ` Jeff King
2016-09-29 9:25 ` 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=20160928233047.14313-2-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.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).