git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/5] update-index doc: note a fixed bug in the untracked cache

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Jan 24, 2018, 09:30 UTC
Message-ID
<20180124093023.9071-5-pclouds@gmail.com>
In-Reply-To
<20180124093023.9071-1-pclouds@gmail.com>
From: Ævar Arnfjörð Bjarmason <avarab@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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@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.16.0.47.g3d9b0fac3a
Previous: Nguyễn Thái Ngọc DuyNext: Nguyễn Thái Ngọc Duy
Message 8 of 12 in “dir.c: print correct errno when opendir() fails”
  1. dir.c: print correct errno when opendir() failsNguyễn Thái Ngọc Duy, Jan 18, 2018
  2. Junio C HamanoJan 19, 2018
  3. Duy NguyenJan 21, 2018
  4. 0/5 nd/fix-untracked-cache-invalidation updatesNguyễn Thái Ngọc Duy, Jan 24, 2018
  5. 1/5 status: add a failing test showing a core.untrackedCache bugNguyễn Thái Ngọc Duy, Jan 24, 2018
  6. 2/5 dir.c: avoid stat() in valid_cached_dir()Nguyễn Thái Ngọc Duy, Jan 24, 2018
  7. 3/5 dir.c: fix missing dir invalidation in untracked codeNguyễn Thái Ngọc Duy, Jan 24, 2018
  8. 4/5 update-index doc: note a fixed bug in the untracked cacheNguyễn Thái Ngọc Duy, Jan 24, 2018
  9. 5/5 dir.c: stop ignoring opendir() error in open_cached_dir()Nguyễn Thái Ngọc Duy, Jan 24, 2018
  10. Ævar Arnfjörð BjarmasonFeb 1, 2018
  11. Ævar Arnfjörð BjarmasonJan 24, 2018
  12. Junio C HamanoJan 24, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.