From: Tian Yuchen <a3205153416@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v2] setup: fail if .git is not a file or directory
Date: Fri, 13 Feb 2026 01:24:05 +0800 [thread overview]
Message-ID: <20260212172405.48614-1-a3205153416@gmail.com> (raw)
In-Reply-To: <20260211182122.35352-1-a3205153416@gmail.com>
Currently, `setup_git_directory_gently_1()` checks if `.git` is a
regular file (handling submodules/worktrees) or a directory. If it is
neither (e.g., a FIFO), the code hits a NEEDSWORK comment and simply
ignores the entity, continuing the discovery process in the parent
directory.
Failing instead of ignoring here makes it easier for the users to notice
anomalies and take action, particularly if this non-file non-directory
entity was created by mistake or by file system corruption.
Resolve the NEEDSWORK by using `lstat()` to check the entity's mode. To
avoid performance penalties on the happy path, this check is only
performed after `is_git_directory()` fails.
Signed-off-by: Tian Yuchen <a3205153416@gmail.com>
---
Change in v2:
- Moved the `lstat` check into an `else` block after `is_git_directory()`
to avoid any extra system call overhead on the normal happy path, as
suggested by Junio.
setup.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/setup.c b/setup.c
index 3a6a048620..95658f2547 100644
--- a/setup.c
+++ b/setup.c
@@ -1580,11 +1580,23 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
NULL : &error_code);
if (!gitdirenv) {
if (die_on_error ||
- error_code == READ_GITFILE_ERR_NOT_A_FILE) {
- /* NEEDSWORK: fail if .git is not file nor dir */
- if (is_git_directory(dir->buf)) {
+ error_code == READ_GITFILE_ERR_NOT_A_FILE) {
+ if (is_git_directory(dir->buf)){
gitdirenv = DEFAULT_GIT_DIR_ENVIRONMENT;
gitdir_path = xstrdup(dir->buf);
+ } else {
+ /*
+ * It is neither a gitfile nor a git directory.
+ */
+ struct stat st;
+ if (!lstat(dir->buf, &st) &&
+ !S_ISREG(st.st_mode) &&
+ !S_ISDIR(st.st_mode)) {
+ if (die_on_error)
+ die(_("Invalid %s: not a regular file or directory"), dir->buf);
+ else
+ return GIT_DIR_INVALID_GITFILE;
+ }
}
} else if (error_code != READ_GITFILE_ERR_STAT_FAILED)
return GIT_DIR_INVALID_GITFILE;
--
2.43.0
next prev parent reply other threads:[~2026-02-12 17:24 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-11 18:21 [RFC] setup: fail if .git is not a file or directory Tian Yuchen
2026-02-11 19:47 ` Junio C Hamano
2026-02-12 17:33 ` Tian Yuchen
2026-02-12 17:24 ` Tian Yuchen [this message]
2026-02-12 20:59 ` [PATCH v2] " Junio C Hamano
2026-02-13 16:37 ` Tian Yuchen
2026-02-14 4:52 ` [PATCH v3] " Tian Yuchen
2026-02-15 8:41 ` Junio C Hamano
2026-02-15 16:22 ` Tian Yuchen
2026-02-16 2:37 ` Junio C Hamano
2026-02-16 16:02 ` Tian Yuchen
2026-02-17 8:41 ` [PATCH v4] setup: allow cwd/.git to be a symlink to a directory Tian Yuchen
2026-02-17 11:26 ` Karthik Nayak
2026-02-17 15:30 ` Tian Yuchen
2026-02-17 18:56 ` Karthik Nayak
2026-02-17 21:10 ` Junio C Hamano
2026-02-17 17:01 ` Junio C Hamano
2026-02-17 18:50 ` Karthik Nayak
2026-02-18 4:08 ` Tian Yuchen
2026-02-17 17:59 ` Karthik Nayak
2026-02-18 5:18 ` [PATCH v5 0/2] setup.c: v5 reroll Tian Yuchen
2026-02-18 5:18 ` [PATCH v5 1/2] setup: distingush ENOENT from other stat errors Tian Yuchen
2026-02-18 10:12 ` Karthik Nayak
2026-02-18 11:11 ` Tian Yuchen
2026-02-18 18:15 ` Junio C Hamano
2026-02-18 18:43 ` Junio C Hamano
2026-02-18 5:18 ` [PATCH v5 2/2] setup: allow cwd/.git to be a symlink to a directory Tian Yuchen
2026-02-18 10:27 ` Karthik Nayak
2026-02-18 11:20 ` Tian Yuchen
2026-02-18 18:25 ` Junio C Hamano
2026-02-19 5:11 ` Tian Yuchen
2026-02-15 17:08 ` [PATCH v3] setup: fail if .git is not a file or directory Tian Yuchen
2026-02-12 22:39 ` [RFC] " brian m. carlson
2026-02-12 22:45 ` Junio C Hamano
2026-02-12 23:03 ` brian m. carlson
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=20260212172405.48614-1-a3205153416@gmail.com \
--to=a3205153416@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox