From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Duy Nguyen <pclouds@gmail.com>,
Brandon Williams <bmwill@google.com>
Subject: [PATCH v5 08/11] read_early_config(): really discover .git/
Date: Thu, 9 Mar 2017 23:25:03 +0100 (CET) [thread overview]
Message-ID: <40053216acd5190a3f26564664d09b35def8cced.1489098170.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1489098170.git.johannes.schindelin@gmx.de>
Earlier, we punted and simply assumed that we are in the top-level
directory of the project, and that there is no .git file but a .git/
directory so that we can read directly from .git/config.
However, that is not necessarily true. We may be in a subdirectory. Or
.git may be a gitfile. Or the environment variable GIT_DIR may be set.
To remedy this situation, we just refactored the way
setup_git_directory() discovers the .git/ directory, to make it
reusable, and more importantly, to leave all global variables and the
current working directory alone.
Let's discover the .git/ directory correctly in read_early_config() by
using that new function.
This fixes 4 known breakages in t7006.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
config.c | 31 ++++++++++++-------------------
| 8 ++++----
2 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/config.c b/config.c
index 068fa4dcfa6..a88df53fdbc 100644
--- a/config.c
+++ b/config.c
@@ -1414,34 +1414,27 @@ static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
void read_early_config(config_fn_t cb, void *data)
{
+ struct strbuf buf = STRBUF_INIT;
+
git_config_with_options(cb, data, NULL, 1);
/*
- * Note that this is a really dirty hack that does the wrong thing in
- * many cases. The crux of the problem is that we cannot run
- * setup_git_directory() early on in git's setup, so we have no idea if
- * we are in a repository or not, and therefore are not sure whether
- * and how to read repository-local config.
- *
- * So if we _aren't_ in a repository (or we are but we would reject its
- * core.repositoryformatversion), we'll read whatever is in .git/config
- * blindly. Similarly, if we _are_ in a repository, but not at the
- * root, we'll fail to find .git/config (because it's really
- * ../.git/config, etc), unless setup_git_directory() was already called.
- * See t7006 for a complete set of failures.
- *
- * However, we have historically provided this hack because it does
- * work some of the time (namely when you are at the top-level of a
- * valid repository), and would rarely make things worse (i.e., you do
- * not generally have a .git/config file sitting around).
+ * When setup_git_directory() was not yet asked to discover the
+ * GIT_DIR, we ask discover_git_directory() to figure out whether there
+ * is any repository config we should use (but unlike
+ * setup_git_directory_gently(), no global state is changed, most
+ * notably, the current working directory is still the same after the
+ * call).
*/
- if (!have_git_dir()) {
+ if (!have_git_dir() && discover_git_directory(&buf)) {
struct git_config_source repo_config;
memset(&repo_config, 0, sizeof(repo_config));
- repo_config.file = ".git/config";
+ strbuf_addstr(&buf, "/config");
+ repo_config.file = buf.buf;
git_config_with_options(cb, data, &repo_config, 1);
}
+ strbuf_release(&buf);
}
static void git_config_check_init(void);
--git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 304ae06c600..4f3794d415e 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -360,19 +360,19 @@ test_pager_choices 'git aliasedlog'
test_default_pager expect_success 'git -p aliasedlog'
test_PAGER_overrides expect_success 'git -p aliasedlog'
test_core_pager_overrides expect_success 'git -p aliasedlog'
-test_core_pager_subdir expect_failure 'git -p aliasedlog'
+test_core_pager_subdir expect_success 'git -p aliasedlog'
test_GIT_PAGER_overrides expect_success 'git -p aliasedlog'
test_default_pager expect_success 'git -p true'
test_PAGER_overrides expect_success 'git -p true'
test_core_pager_overrides expect_success 'git -p true'
-test_core_pager_subdir expect_failure 'git -p true'
+test_core_pager_subdir expect_success 'git -p true'
test_GIT_PAGER_overrides expect_success 'git -p true'
test_default_pager expect_success test_must_fail 'git -p request-pull'
test_PAGER_overrides expect_success test_must_fail 'git -p request-pull'
test_core_pager_overrides expect_success test_must_fail 'git -p request-pull'
-test_core_pager_subdir expect_failure test_must_fail 'git -p request-pull'
+test_core_pager_subdir expect_success test_must_fail 'git -p request-pull'
test_GIT_PAGER_overrides expect_success test_must_fail 'git -p request-pull'
test_default_pager expect_success test_must_fail 'git -p'
@@ -380,7 +380,7 @@ test_PAGER_overrides expect_success test_must_fail 'git -p'
test_local_config_ignored expect_failure test_must_fail 'git -p'
test_GIT_PAGER_overrides expect_success test_must_fail 'git -p'
-test_expect_failure TTY 'core.pager in repo config works and retains cwd' '
+test_expect_success TTY 'core.pager in repo config works and retains cwd' '
sane_unset GIT_PAGER &&
test_config core.pager "cat >cwd-retained" &&
(
--
2.12.0.windows.1.7.g94dafc3b124
next prev parent reply other threads:[~2017-03-09 22:25 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-08 15:35 [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 1/7] Make read_early_config() reusable Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 2/7] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 3/7] Mark builtins that create .git/ directories Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 4/7] read_early_config(): special-case `init` and `clone` Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 5/7] read_early_config(): really discover .git/ Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 6/7] WIP read_config_early(): respect ceiling directories Johannes Schindelin
2016-12-08 15:36 ` [PATCH/RFC 7/7] WIP: read_early_config(): add tests Johannes Schindelin
2016-12-08 17:26 ` [PATCH/RFC 0/7] Pie-in-the-sky attempt to fix the early config Jeff King
2016-12-09 17:28 ` Johannes Schindelin
2016-12-09 17:55 ` Jeff King
2016-12-09 12:42 ` Duy Nguyen
2016-12-09 16:52 ` Johannes Schindelin
2017-03-03 2:03 ` [PATCH v2 0/9] Fix " Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 1/9] t7006: replace dubious test Johannes Schindelin
2017-03-03 3:36 ` Jeff King
2017-03-03 11:10 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 2/9] setup_git_directory(): use is_dir_sep() helper Johannes Schindelin
2017-03-03 3:37 ` Jeff King
2017-03-03 11:16 ` Johannes Schindelin
2017-03-03 11:26 ` Jeff King
2017-03-03 15:35 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 3/9] setup_git_directory(): avoid changing global state during discovery Johannes Schindelin
2017-03-03 4:24 ` Jeff King
2017-03-03 13:54 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 4/9] Export the discover_git_directory() function Johannes Schindelin
2017-03-03 4:45 ` Jeff King
2017-03-03 14:49 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 5/9] Make read_early_config() reusable Johannes Schindelin
2017-03-03 4:46 ` Jeff King
2017-03-03 14:11 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 6/9] read_early_config(): special-case builtins that create a repository Johannes Schindelin
2017-03-03 4:51 ` Jeff King
2017-03-03 15:11 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 7/9] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2017-03-03 4:51 ` Jeff King
2017-03-03 2:04 ` [PATCH v2 8/9] read_early_config(): really discover .git/ Johannes Schindelin
2017-03-03 5:06 ` Jeff King
2017-03-03 15:26 ` Johannes Schindelin
2017-03-03 2:04 ` [PATCH v2 9/9] Test read_early_config() Johannes Schindelin
2017-03-03 5:07 ` Jeff King
2017-03-03 15:04 ` Johannes Schindelin
2017-03-03 5:14 ` [PATCH v2 0/9] Fix the early config Jeff King
2017-03-03 15:31 ` Johannes Schindelin
2017-03-03 17:31 ` [PATCH v3 " Johannes Schindelin
2017-03-03 17:32 ` [PATCH v3 1/9] t7006: replace dubious test Johannes Schindelin
2017-03-03 17:32 ` [PATCH v3 2/9] setup_git_directory(): use is_dir_sep() helper Johannes Schindelin
2017-03-03 17:32 ` [PATCH v3 3/9] Prepare setup_discovered_git_directory() the root directory Johannes Schindelin
2017-03-03 17:32 ` [PATCH v3 4/9] setup_git_directory_1(): avoid changing global state Johannes Schindelin
2017-03-03 17:33 ` [PATCH v3 5/9] Export the discover_git_directory() function Johannes Schindelin
2017-03-03 17:33 ` [PATCH v3 6/9] Make read_early_config() reusable Johannes Schindelin
2017-03-03 17:33 ` [PATCH v3 7/9] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2017-03-03 17:33 ` [PATCH v3 8/9] read_early_config(): really discover .git/ Johannes Schindelin
2017-03-03 17:33 ` [PATCH v3 9/9] Test read_early_config() Johannes Schindelin
2017-03-03 21:35 ` [PATCH v3 0/9] Fix the early config Junio C Hamano
2017-03-07 11:55 ` Johannes Schindelin
2017-03-07 15:18 ` Johannes Schindelin
2017-03-04 7:39 ` Jeff King
2017-03-05 3:36 ` Junio C Hamano
2017-03-07 14:31 ` Johannes Schindelin
2017-03-08 7:30 ` Jeff King
2017-03-08 16:18 ` Johannes Schindelin
2017-03-08 16:29 ` Jeff King
2017-03-08 17:09 ` Junio C Hamano
2017-03-08 17:42 ` Jeff King
2017-03-08 22:43 ` Junio C Hamano
2017-03-09 11:51 ` Johannes Schindelin
2017-03-09 12:16 ` Jeff King
2017-03-10 16:39 ` Junio C Hamano
2017-03-07 14:32 ` [PATCH v4 00/10] " Johannes Schindelin
2017-03-07 14:32 ` [PATCH v4 01/10] t7006: replace dubious test Johannes Schindelin
2017-03-07 14:32 ` [PATCH v4 02/10] setup_git_directory(): use is_dir_sep() helper Johannes Schindelin
2017-03-07 14:32 ` [PATCH v4 03/10] Prepare setup_discovered_git_directory() the root directory Johannes Schindelin
2017-03-07 14:32 ` [PATCH v4 04/10] setup_git_directory_1(): avoid changing global state Johannes Schindelin
2017-03-07 23:24 ` Junio C Hamano
2017-03-07 23:35 ` Brandon Williams
2017-03-08 0:57 ` Johannes Schindelin
2017-03-08 2:10 ` Brandon Williams
2017-03-07 14:33 ` [PATCH v4 05/10] Introduce the discover_git_directory() function Johannes Schindelin
2017-03-07 14:33 ` [PATCH v4 06/10] Make read_early_config() reusable Johannes Schindelin
2017-03-07 14:33 ` [PATCH v4 07/10] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2017-03-07 14:33 ` [PATCH v4 08/10] read_early_config(): really discover .git/ Johannes Schindelin
2017-03-07 14:33 ` [PATCH v4 09/10] Test read_early_config() Johannes Schindelin
2017-03-07 14:33 ` [PATCH v4 10/10] setup_git_directory_gently_1(): avoid die()ing Johannes Schindelin
2017-03-09 22:23 ` [PATCH v5 00/11] Fix the early config Johannes Schindelin
2017-03-09 22:23 ` [PATCH v5 01/11] t7006: replace dubious test Johannes Schindelin
2017-03-09 22:23 ` [PATCH v5 02/11] setup_git_directory(): use is_dir_sep() helper Johannes Schindelin
2017-03-09 22:23 ` [PATCH v5 03/11] Prepare setup_discovered_git_directory() the root directory Johannes Schindelin
2017-03-09 22:24 ` [PATCH v5 04/11] setup_git_directory_1(): avoid changing global state Johannes Schindelin
2017-03-10 19:34 ` Junio C Hamano
2017-03-09 22:24 ` [PATCH v5 05/11] Introduce the discover_git_directory() function Johannes Schindelin
2017-03-09 22:24 ` [PATCH v5 06/11] Make read_early_config() reusable Johannes Schindelin
2017-03-09 22:24 ` [PATCH v5 07/11] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2017-03-09 22:25 ` Johannes Schindelin [this message]
2017-03-09 22:25 ` [PATCH v5 09/11] Test read_early_config() Johannes Schindelin
2017-03-10 19:02 ` Junio C Hamano
2017-03-13 17:19 ` Johannes Schindelin
2017-03-13 17:32 ` Junio C Hamano
2017-03-09 22:25 ` [PATCH v5 10/11] setup_git_directory_gently_1(): avoid die()ing Johannes Schindelin
2017-03-10 18:58 ` Junio C Hamano
2017-03-13 19:38 ` Johannes Schindelin
2017-03-13 19:47 ` Junio C Hamano
2017-03-13 20:20 ` Junio C Hamano
2017-03-13 21:46 ` Johannes Schindelin
2017-03-13 23:31 ` Junio C Hamano
2017-03-09 22:25 ` [PATCH v5 11/11] t1309: document cases where we would want early config not to die() Johannes Schindelin
2017-03-13 20:09 ` [PATCH v6 00/12] Fix the early config Johannes Schindelin
2017-03-13 20:09 ` [PATCH v6 01/12] t7006: replace dubious test Johannes Schindelin
2017-03-13 20:09 ` [PATCH v6 02/12] setup_git_directory(): use is_dir_sep() helper Johannes Schindelin
2017-03-13 20:09 ` [PATCH v6 03/12] Prepare setup_discovered_git_directory() the root directory Johannes Schindelin
2017-03-13 20:34 ` Junio C Hamano
2017-03-13 21:44 ` Johannes Schindelin
2017-03-13 20:10 ` [PATCH v6 04/12] setup_git_directory_1(): avoid changing global state Johannes Schindelin
2017-03-13 20:10 ` [PATCH v6 05/12] Introduce the discover_git_directory() function Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 06/12] Make read_early_config() reusable Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 07/12] read_early_config(): avoid .git/config hack when unneeded Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 08/12] read_early_config(): really discover .git/ Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 09/12] Add t1309 to test read_early_config() Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 10/12] setup_git_directory_gently_1(): avoid die()ing Johannes Schindelin
2017-03-13 20:11 ` [PATCH v6 11/12] t1309: document cases where we would want early config not to die() Johannes Schindelin
2017-03-13 20:12 ` [PATCH v6 12/12] setup.c: mention unresolved problems Johannes Schindelin
2017-03-13 22:31 ` [PATCH v6 00/12] Fix the early config Junio C Hamano
2017-03-14 18:01 ` 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=40053216acd5190a3f26564664d09b35def8cced.1489098170.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=bmwill@google.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.
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).