Note (reason for RFC): this is RFC primarily because of dependencies (you may not want to pick this up yet, Junio), though there is also a question of whether to split patch 7 into two steps -- one for now and one we take in some future release. In particular, the first step could be to have sparse-checkout error out if neither --no-cone nor --cone are specified and then change the default to be --cone in some future release. I don't think splitting it into two steps is needed given (a) users who are unaware of the change will still get useful error messages telling them that directories are expected due to patches 4-6 of this series, and (b) the huge "EXPERIMENTAL" warning and explicit note about likely behavioral changes in git-sparse-checkout.txt serves as warning about the changes. However, the two step approach is an alternative. Note 2 (dependencies): this depends on en/present-despite-skipped (which depends on vd/sparse-clean-etc) and on ds/sparse-checkout-requires-per-worktree-config, because of otherwise heavy text conflicts in patch 7 to git-sparse-checkout.txt. Given that neither of those have merged to next yet, it may be premature to pick up this series. This series continues attempts to make sparse-checkouts more user friendly. A quick overview: * Patches 1-2 fix existing bugs from en/sparse-checkout-set * Patch 3 fixes sparse-checkout-from-subdirectories-ignores-"prefix" (see https://lore.kernel.org/git/29f0410e-6dfa-2e86-394d-b1fb735e7608@xxxxxxxxx/), at least in cone mode. In non-cone mode it is not clear if patch 3 is a "fix" or a "break" (see the "NON-CONE PROBLEMS" section of the manual added in patch 7, and https://lore.kernel.org/git/e1934710-e228-adc4-d37c-f706883bd27c@xxxxxxxxx/ where Stolee suggested it might be incorrect). * Patches 4-6 check positional arguments to set/add and provide errors/warnings for very likely mistakes. It also adds a --skip-checks flag for overridding in case you have a very unusual situation. * Patch 7 makes cone mode the default, and makes large updates to the documentation both to explain why we changed the default, and to simplify the documentation since users can just use directories and ignore the intricacies of gitignore-style patterns and how they relate to sparse checkouts. Elijah Newren (7): sparse-checkout: correct reapply's handling of options sparse-checkout: correctly set non-cone mode when expected sparse-checkout: pay attention to prefix for {set, add} sparse-checkout: error or warn when given individual files sparse-checkout: reject non-cone-mode patterns starting with a '#' sparse-checkout: reject arguments in cone-mode that look like patterns sparse-checkout: make --cone the default and deprecate --no-cone Documentation/git-sparse-checkout.txt | 228 +++++++++++++++++++------- builtin/sparse-checkout.c | 86 +++++++++- t/t1091-sparse-checkout-builtin.sh | 97 ++++++++++- t/t3602-rm-sparse-checkout.sh | 6 +- t/t3705-add-sparse-checkout.sh | 4 +- t/t6428-merge-conflicts-sparse.sh | 4 +- t/t7002-mv-sparse-checkout.sh | 2 +- t/t7012-skip-worktree-writing.sh | 2 +- 8 files changed, 345 insertions(+), 84 deletions(-) base-commit: a813c7516ab581570509aa7a9c03ca05c769caf7 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1118%2Fnewren%2Fsparse-checkout-default-and-arg-validity-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1118/newren/sparse-checkout-default-and-arg-validity-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1118 -- gitgitgadget
