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

[PATCH 0/2] Sparse index: delete ignored files outside sparse cone

From
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Date
Jul 29, 2021, 17:27 UTC
Message-ID
<pull.1009.git.1627579637.gitgitgadget@gmail.com>

My commits are technically based on ds/add-with-sparse-index, but could apply earlier, I believe.

We launched an experimental release [1] of the sparse-index feature to our internal users. We immediately discovered a problem due to the isolated way in which we tested the sparse index: we were never building the project and changing our sparse-checkout definition.

[1] https://github.com/microsoft/git/releases/tag/v2.32.0.vfs.0.102.exp

Users who ran a build in one project and then moved to another still had build artifacts in their worktree that lived inside the old directories. Since the files are marked by the .gitignore patterns, these files were not removed by the 'git sparse-checkout set' command. However, they make the sparse-index unusable because every 'git status' command needs to expand the sparse-directory entries in order to see if the files are tracked or not. This made the first experimental release actually slower for all users because of this cost.

The solution we shipped to these customers was to change the way our fork handles these ignored files. Specifically, instead of Git completely ignoring the files, we changed Git to understand that with cone-mode sparse-checkout patterns, the users is asking for entire directories to be removed from the worktree. The link [1] included earlier has this change.

I believe that this is a reasonable expectation, though I recognize that it might look like breaking the expectations of how .gitignore files work.

To limit the scope of this change, the focus is limited to behave this way only when the sparse-index is enabled, because otherwise the sparse index does not behave as intended. With that restriction in mind, the implementation can use the sparse directory entries to assist.

I imagine that when the sparse index is mature enough, we will enable it by default when cone mode sparse-checkout is enabled, in which case this behavior would expand to all users with cone mode sparse-checkout.

I'm interested in the community's thoughts about this change, as it seems like one that we should make carefully and intentionally.

While the rewrite of the t7519 test seems unrelated, it is required to avoid a test failure with this change that deletes files outside of the cone. By moving the test into repositories not at $TRASH_DIRECTORY, we gain more control over the repository structure.

Thanks, -Stolee
Derrick Stolee (2):
  t7519: rewrite sparse index test
  sparse-checkout: clear tracked sparse dirs
 Documentation/git-sparse-checkout.txt |  6 +++
 builtin/sparse-checkout.c             | 73 +++++++++++++++++++++++++++
 t/t1091-sparse-checkout-builtin.sh    | 42 +++++++++++++++
 t/t7519-status-fsmonitor.sh           | 38 +++++++-------
 4 files changed, 142 insertions(+), 17 deletions(-)
base-commit: adf5b15ac3d44d92e0438451ef36631ed3ee2a63
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1009%2Fderrickstolee%2Fsparse-index%2Fignored-files-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1009/derrickstolee/sparse-index/ignored-files-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1009
-- 
gitgitgadget
Next: Derrick Stolee via GitGitGadget
Message 1 of 92 in “Sparse index: delete ignored files outside sparse cone”
  1. 0/2 Sparse index: delete ignored files outside sparse coneDerrick Stolee via GitGitGadget, Jul 29, 2021
  2. 1/2 t7519: rewrite sparse index testDerrick Stolee via GitGitGadget, Jul 29, 2021
  3. 2/2 sparse-checkout: clear tracked sparse dirsDerrick Stolee via GitGitGadget, Jul 29, 2021
  4. Elijah NewrenJul 30, 2021
  5. Derrick StoleeAug 2, 2021
  6. Elijah NewrenAug 2, 2021
  7. Derrick StoleeAug 5, 2021
  8. Elijah NewrenAug 5, 2021
  9. Elijah NewrenJul 30, 2021
  10. 0/8 Sparse index: delete ignored files outside sparse coneDerrick Stolee via GitGitGadget, Aug 10, 2021
  11. 1/8 t7519: rewrite sparse index testDerrick Stolee via GitGitGadget, Aug 10, 2021
  12. 2/8 sparse-index: silently return when not using cone-mode patternsDerrick Stolee via GitGitGadget, Aug 10, 2021
  13. 3/8 sparse-index: silently return when cache tree failsDerrick Stolee via GitGitGadget, Aug 10, 2021
  14. Elijah NewrenAug 19, 2021
  15. Derrick StoleeAug 20, 2021
  16. 4/8 unpack-trees: fix nested sparse-dir searchDerrick Stolee via GitGitGadget, Aug 10, 2021
  17. 5/8 sparse-checkout: create helper methodsDerrick Stolee via GitGitGadget, Aug 10, 2021
  18. Derrick StoleeAug 12, 2021
  19. 6/8 attr: be careful about sparse directoriesDerrick Stolee via GitGitGadget, Aug 10, 2021
  20. 7/8 sparse-index: add SPARSE_INDEX_IGNORE_CONFIG flagDerrick Stolee via GitGitGadget, Aug 10, 2021
  21. 8/8 sparse-checkout: clear tracked sparse dirsDerrick Stolee via GitGitGadget, Aug 10, 2021
  22. 0/8 Sparse index: delete ignored files outside sparse coneDerrick Stolee via GitGitGadget, Aug 17, 2021
  23. 2/8 sparse-index: silently return when not using cone-mode patternsDerrick Stolee via GitGitGadget, Aug 17, 2021
  24. 1/8 t7519: rewrite sparse index testDerrick Stolee via GitGitGadget, Aug 17, 2021
  25. Johannes SchindelinAug 19, 2021
  26. Derrick StoleeAug 20, 2021
  27. Eric SunshineAug 20, 2021
  28. 3/8 sparse-index: silently return when cache tree failsDerrick Stolee via GitGitGadget, Aug 17, 2021
  29. 5/8 sparse-checkout: create helper methodsDerrick Stolee via GitGitGadget, Aug 17, 2021
  30. Johannes SchindelinAug 19, 2021
  31. Derrick StoleeAug 20, 2021
  32. 4/8 unpack-trees: fix nested sparse-dir searchDerrick Stolee via GitGitGadget, Aug 17, 2021
  33. Johannes SchindelinAug 19, 2021
  34. Derrick StoleeAug 20, 2021
  35. René ScharfeAug 20, 2021
  36. René ScharfeAug 20, 2021
  37. Elijah NewrenAug 19, 2021
  38. 8/8 sparse-checkout: clear tracked sparse dirsDerrick Stolee via GitGitGadget, Aug 17, 2021
  39. Johannes SchindelinAug 19, 2021
  40. Derrick StoleeAug 20, 2021
  41. Elijah NewrenAug 20, 2021
  42. Elijah NewrenAug 20, 2021
  43. Johannes SchindelinAug 23, 2021
  44. 7/8 sparse-index: add SPARSE_INDEX_IGNORE_CONFIG flagDerrick Stolee via GitGitGadget, Aug 17, 2021
  45. Derrick StoleeAug 18, 2021
  46. 6/8 attr: be careful about sparse directoriesDerrick Stolee via GitGitGadget, Aug 17, 2021
  47. Johannes SchindelinAug 19, 2021
  48. Derrick StoleeAug 20, 2021
  49. Elijah NewrenAug 19, 2021
  50. Derrick StoleeAug 20, 2021
  51. Elijah NewrenAug 20, 2021
  52. Elijah NewrenAug 17, 2021
  53. 00/10 Sparse index: delete ignored files outside sparse coneDerrick Stolee via GitGitGadget, Aug 24, 2021
  54. 01/10 t7519: rewrite sparse index testDerrick Stolee via GitGitGadget, Aug 24, 2021
  55. 02/10 sparse-index: silently return when not using cone-mode patternsDerrick Stolee via GitGitGadget, Aug 24, 2021
  56. 03/10 sparse-index: silently return when cache tree failsDerrick Stolee via GitGitGadget, Aug 24, 2021
  57. 04/10 sparse-index: use WRITE_TREE_MISSING_OKDerrick Stolee via GitGitGadget, Aug 24, 2021
  58. Elijah NewrenAug 27, 2021
  59. Derrick StoleeAug 30, 2021
  60. Elijah NewrenAug 30, 2021
  61. 05/10 unpack-trees: fix nested sparse-dir searchDerrick Stolee via GitGitGadget, Aug 24, 2021
  62. René ScharfeAug 24, 2021
  63. Derrick StoleeAug 25, 2021
  64. 06/10 sparse-checkout: create helper methodsDerrick Stolee via GitGitGadget, Aug 24, 2021
  65. 07/10 attr: be careful about sparse directoriesDerrick Stolee via GitGitGadget, Aug 24, 2021
  66. 08/10 sparse-index: add SPARSE_INDEX_MEMORY_ONLY flagDerrick Stolee via GitGitGadget, Aug 24, 2021
  67. 09/10 sparse-checkout: clear tracked sparse dirsDerrick Stolee via GitGitGadget, Aug 24, 2021
  68. 10/10 sparse-checkout: add config to disable deleting dirsDerrick Stolee via GitGitGadget, Aug 24, 2021
  69. Elijah NewrenAug 27, 2021
  70. Derrick StoleeAug 30, 2021
  71. Elijah NewrenAug 30, 2021
  72. Elijah NewrenAug 27, 2021
  73. Elijah NewrenAug 27, 2021
  74. Derrick StoleeAug 30, 2021
  75. Elijah NewrenAug 30, 2021
  76. Derrick StoleeAug 30, 2021
  77. Elijah NewrenAug 30, 2021
  78. 0/9 Sparse index: delete ignored files outside sparse coneDerrick Stolee via GitGitGadget, Sep 8, 2021
  79. 1/9 t7519: rewrite sparse index testDerrick Stolee via GitGitGadget, Sep 8, 2021
  80. 2/9 sparse-index: silently return when not using cone-mode patternsDerrick Stolee via GitGitGadget, Sep 8, 2021
  81. 3/9 unpack-trees: fix nested sparse-dir searchDerrick Stolee via GitGitGadget, Sep 8, 2021
  82. 5/9 sparse-index: use WRITE_TREE_MISSING_OKDerrick Stolee via GitGitGadget, Sep 8, 2021
  83. 4/9 sparse-index: silently return when cache tree failsDerrick Stolee via GitGitGadget, Sep 8, 2021
  84. 6/9 sparse-checkout: create helper methodsDerrick Stolee via GitGitGadget, Sep 8, 2021
  85. 7/9 attr: be careful about sparse directoriesDerrick Stolee via GitGitGadget, Sep 8, 2021
  86. 8/9 sparse-index: add SPARSE_INDEX_MEMORY_ONLY flagDerrick Stolee via GitGitGadget, Sep 8, 2021
  87. 9/9 sparse-checkout: clear tracked sparse dirsDerrick Stolee via GitGitGadget, Sep 8, 2021
  88. Junio C HamanoSep 8, 2021
  89. Junio C HamanoSep 8, 2021
  90. Derrick StoleeSep 8, 2021
  91. Junio C HamanoSep 8, 2021
  92. Elijah NewrenSep 8, 2021

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.