From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
rappazzo@gmail.com, kyle@kyleam.com, sunshine@sunshineco.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X
Date: Mon, 2 Nov 2015 20:08:26 +0100 [thread overview]
Message-ID: <1446491306-13493-1-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <xmqqwpu7klmu.fsf@gitster.mtv.corp.google.com>
$X/gitdir is created, or refreshed, in order to keep a linked worktree
from being pruned. But while git file is used as the foundation for
linked worktrees, it's used for other purposes as well and we should
not create $X/gitdir in those cases.
Tighten the check. Only update an existing file, which is an
indication this is a linked worktree.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
setup.c | 2 +-
t/t0002-gitfile.sh | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index d343725..b30d923 100644
--- a/setup.c
+++ b/setup.c
@@ -440,7 +440,7 @@ static void update_linked_gitdir(const char *gitfile, const char *gitdir)
struct stat st;
strbuf_addf(&path, "%s/gitdir", gitdir);
- if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
+ if (!stat(path.buf, &st) && st.st_mtime + 24 * 3600 < time(NULL))
write_file(path.buf, "%s", gitfile);
strbuf_release(&path);
}
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 9670e8c..b1b59f2 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -99,6 +99,13 @@ test_expect_success 'check rev-list' '
test "$SHA" = "$(git rev-list HEAD)"
'
+test_expect_success '$REAL/gitdir is not created on ordinary git file' '
+ echo "gitdir: $REAL" >expected &&
+ test_cmp expected .git &&
+ git status &&
+ ! test -f "$REAL"/gitdir
+'
+
test_expect_success 'setup_git_dir twice in subdir' '
git init sgd &&
(
--
2.2.0.513.g477eb31
next prev parent reply other threads:[~2015-11-02 19:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 22:04 What's the ".git/gitdir" file? Kyle Meyer
2015-10-27 22:22 ` Stefan Beller
2015-10-27 22:42 ` Randall S. Becker
2015-10-27 22:54 ` Stefan Beller
2015-10-27 22:54 ` Junio C Hamano
2015-10-27 23:26 ` Mike Rappazzo
2015-10-28 16:23 ` Junio C Hamano
2015-11-02 19:08 ` Nguyễn Thái Ngọc Duy [this message]
2015-11-02 20:01 ` [PATCH] setup: do not create $X/gitdir unnecessarily when accessing git file $X Eric Sunshine
2015-11-02 20:35 ` Jeff King
2015-11-02 20:51 ` Junio C Hamano
2015-11-02 20:52 ` Jeff King
2015-11-03 5:48 ` Duy Nguyen
2015-11-03 19:54 ` Junio C Hamano
2015-12-27 3:43 ` [PATCH] worktree: stop supporting moving worktrees manually Nguyễn Thái Ngọc Duy
2015-12-28 6:22 ` Eric Sunshine
2015-12-29 13:55 ` Duy Nguyen
2015-12-31 5:59 ` Eric Sunshine
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=1446491306-13493-1-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kyle@kyleam.com \
--cc=rappazzo@gmail.com \
--cc=sunshine@sunshineco.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;
as well as URLs for NNTP newsgroup(s).