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>
Subject: [PATCH v4 10/10] setup_git_directory_gently_1(): avoid die()ing
Date: Tue, 7 Mar 2017 15:33:30 +0100 (CET) [thread overview]
Message-ID: <642c42bb97c3fc4943aaec0fc77173f415d246bc.1488897111.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1488897111.git.johannes.schindelin@gmx.de>
This function now has a new caller in addition to setup_git_directory():
the newly introduced discover_git_directory(). That function wants to
discover the current .git/ directory, and in case of a corrupted one
simply pretend that there is none to be found.
Example: if a stale .git file exists in the parent directory, and the
user calls `git -p init`, we want Git to simply *not* read any
repository config for the pager (instead of aborting with a message that
the .git file is corrupt).
Let's actually pretend that there was no GIT_DIR to be found in that case
when being called from discover_git_directory(), but keep the previous
behavior (i.e. to die()) for the setup_git_directory() case.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
setup.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/setup.c b/setup.c
index 486acda2054..9118b48590a 100644
--- a/setup.c
+++ b/setup.c
@@ -825,7 +825,8 @@ enum discovery_result {
GIT_DIR_BARE,
/* these are errors */
GIT_DIR_HIT_CEILING = -1,
- GIT_DIR_HIT_MOUNT_POINT = -2
+ GIT_DIR_HIT_MOUNT_POINT = -2,
+ GIT_DIR_INVALID_GITFILE = -3
};
/*
@@ -842,7 +843,8 @@ enum discovery_result {
* `dir` (i.e. *not* necessarily the cwd).
*/
static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
- struct strbuf *gitdir)
+ struct strbuf *gitdir,
+ int die_on_error)
{
const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);
struct string_list ceiling_dirs = STRING_LIST_INIT_DUP;
@@ -890,14 +892,22 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
if (one_filesystem)
current_device = get_device_or_die(dir->buf, NULL, 0);
for (;;) {
- int offset = dir->len;
+ int offset = dir->len, error_code = 0;
if (offset > min_offset)
strbuf_addch(dir, '/');
strbuf_addstr(dir, DEFAULT_GIT_DIR_ENVIRONMENT);
- gitdirenv = read_gitfile(dir->buf);
- if (!gitdirenv && is_git_directory(dir->buf))
- gitdirenv = DEFAULT_GIT_DIR_ENVIRONMENT;
+ gitdirenv = read_gitfile_gently(dir->buf, die_on_error ?
+ NULL : &error_code);
+ if (!gitdirenv) {
+ if (die_on_error ||
+ error_code == READ_GITFILE_ERR_NOT_A_FILE) {
+ if (is_git_directory(dir->buf))
+ gitdirenv = DEFAULT_GIT_DIR_ENVIRONMENT;
+ } else if (error_code &&
+ error_code != READ_GITFILE_ERR_STAT_FAILED)
+ return GIT_DIR_INVALID_GITFILE;
+ }
strbuf_setlen(dir, offset);
if (gitdirenv) {
strbuf_addstr(gitdir, gitdirenv);
@@ -934,7 +944,7 @@ const char *discover_git_directory(struct strbuf *gitdir)
return NULL;
cwd_len = dir.len;
- if (setup_git_directory_gently_1(&dir, gitdir) <= 0) {
+ if (setup_git_directory_gently_1(&dir, gitdir, 0) <= 0) {
strbuf_release(&dir);
return NULL;
}
@@ -993,7 +1003,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
die_errno(_("Unable to read current working directory"));
strbuf_addbuf(&dir, &cwd);
- switch (setup_git_directory_gently_1(&dir, &gitdir)) {
+ switch (setup_git_directory_gently_1(&dir, &gitdir, 1)) {
case GIT_DIR_NONE:
prefix = NULL;
break;
--
2.12.0.windows.1.7.g94dafc3b124
next prev parent reply other threads:[~2017-03-07 14:40 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 ` Johannes Schindelin [this message]
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 ` [PATCH v5 08/11] read_early_config(): really discover .git/ Johannes Schindelin
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=642c42bb97c3fc4943aaec0fc77173f415d246bc.1488897111.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--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).