From: Madhu <enometh@meer.net>
To: git@vger.kernel.org
Subject: [PATCH] init: don't reset core.filemode on git-new-workdirs.
Date: Sun, 21 Mar 2021 17:58:21 +0530 (IST) [thread overview]
Message-ID: <20210321.175821.1385189088303987287.enometh@meer.net> (raw)
From: Madhu <enometh@net.meer>
If the .git/config file is a symlink (as is the case of a .git created
by the contrib/workdir/git-new-workdir script) then the filemode tests
fail, and the filemode is reset to be false. To avoid this only munge
core.filemode if .git/config is a regular file.
---
builtin/init-db.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index dcc45bef51..b053107336 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -285,7 +285,8 @@ static int create_default_files(const char *template_path,
/* Check filemode trustability */
path = git_path_buf(&buf, "config");
filemode = TEST_FILEMODE;
- if (TEST_FILEMODE && !lstat(path, &st1)) {
+ if (TEST_FILEMODE && !lstat(path, &st1)
+ && (st1.st_mode & S_IFMT) == S_IFREG) {
struct stat st2;
filemode = (!chmod(path, st1.st_mode ^ S_IXUSR) &&
!lstat(path, &st2) &&
--
2.31.0.dirty
next reply other threads:[~2021-03-21 12:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-21 12:28 Madhu [this message]
2021-03-21 21:58 ` [PATCH] init: don't reset core.filemode on git-new-workdirs Junio C Hamano
2021-03-22 2:40 ` Madhu
2021-03-22 4:53 ` Junio C Hamano
2021-03-22 9:04 ` Madhu
2021-03-22 18:02 ` Junio C Hamano
2021-03-23 3:57 ` Madhu
2021-03-23 6:39 ` Junio C Hamano
2021-03-23 16:53 ` Torsten Bögershausen
2021-03-23 17:45 ` Junio C Hamano
2021-03-23 20:31 ` Torsten Bögershausen
2021-03-23 20:50 ` Junio C Hamano
2021-06-18 4:18 ` Madhu
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=20210321.175821.1385189088303987287.enometh@meer.net \
--to=enometh@meer.net \
--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).