From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>,
"Ben Peart" <benpeart@microsoft.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 4/5] update-index doc: note a fixed bug in the untracked cache
Date: Wed, 3 Jan 2018 20:49:27 +0000 [thread overview]
Message-ID: <20180103204928.3769-5-avarab@gmail.com> (raw)
In-Reply-To: <20180103204928.3769-1-avarab@gmail.com>
In-Reply-To: <CACsJy8BnxOz9brnkyZ58guTsUhgKKN_XQvbYaZJz17888pgHoQ@mail.gmail.com>
Document the bug tested for in my "status: add a failing test showing
a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir
invalidation in untracked code".
Since this is very likely something others will encounter in the
future on older versions, and it's not obvious how to fix it let's
document both that it exists, and how to "fix" it with a one-off
command.
As noted in that commit, even though this bug gets the untracked cache
into a bad state, we have not yet found a case where this is user
visible, and thus it makes sense for these docs to focus on the
symlink case only.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Documentation/git-update-index.txt | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index bdb0342593..128e0c671f 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -464,6 +464,22 @@ command reads the index; while when `--[no-|force-]untracked-cache`
are used, the untracked cache is immediately added to or removed from
the index.
+Before 2.16, the untracked cache had a bug where replacing a directory
+with a symlink to another directory could cause it to incorrectly show
+files tracked by git as untracked. See the "status: add a failing test
+showing a core.untrackedCache bug" commit to git.git. A workaround for
+that was (and this might work for other undiscoverd bugs in the
+future):
+
+----------------
+$ git -c core.untrackedCache=false status
+----------------
+
+This bug has also been shown to affect non-symlink cases of replacing
+a directory with a file when it comes to the internal structures of
+the untracked cache, but no case has been found where this resulted in
+wrong "git status" output.
+
File System Monitor
-------------------
--
2.15.1.424.g9478a66081
next prev parent reply other threads:[~2018-01-03 20:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-28 0:28 [PATCH] dir.c: avoid stat() in valid_cached_dir() Nguyễn Thái Ngọc Duy
2017-12-28 19:05 ` Junio C Hamano
2017-12-28 19:10 ` Junio C Hamano
2018-01-01 23:57 ` Duy Nguyen
2018-01-03 20:49 ` [PATCH v2 0/5] untracked cache bug fixes Ævar Arnfjörð Bjarmason
2018-01-03 20:49 ` [PATCH v2 1/5] status: add a failing test showing a core.untrackedCache bug Ævar Arnfjörð Bjarmason
2018-01-03 20:49 ` [PATCH v2 2/5] dir.c: avoid stat() in valid_cached_dir() Ævar Arnfjörð Bjarmason
2018-01-03 20:49 ` [PATCH v2 3/5] dir.c: fix missing dir invalidation in untracked code Ævar Arnfjörð Bjarmason
2018-01-03 20:49 ` Ævar Arnfjörð Bjarmason [this message]
2018-01-03 20:49 ` [PATCH v2 5/5] dir.c: stop ignoring opendir() error in open_cached_dir() Ævar Arnfjörð Bjarmason
2018-01-07 12:44 ` Duy Nguyen
2017-12-28 19:50 ` [PATCH] dir.c: avoid stat() in valid_cached_dir() Ævar Arnfjörð Bjarmason
2018-01-02 0:02 ` Duy Nguyen
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=20180103204928.3769-5-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--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).