Re: en/present-despite-skipped (Re: What's cooking in git.git (Feb 2022, #05; Thu, 17))
From: Jonathan Nieder <hidden>
Date: 2022-02-22 23:52:17
Jonathan Nieder wrote:
Junio C Hamano wrote:
quoted
* en/present-despite-skipped (2022-01-14) 6 commits (merged to 'next' on 2022-02-15 at 960873fdad) + Accelerate clear_skip_worktree_from_present_files() by caching + Update documentation related to sparsity and the skip-worktree bit + repo_read_index: clear SKIP_WORKTREE bit from files present in worktree + unpack-trees: fix accidental loss of user changes + t1011: add testcase demonstrating accidental loss of user modifications + Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped In sparse-checkouts, files mis-marked as missing from the working tree could lead to later problems. Such files were hard to discover, and harder to correct. Automatically detecting and correcting the marking of such files has been added to avoid these problems. Will merge to 'master'. cf. [ref] source: [ref]I'd recommend holding off on merging to 'master' for now, until we figure out what to do about https://lore.kernel.org/git/YhBCsg2DCEd9FXjE@google.com/ (local). Hopefully that won't take long.
Since as discussed there this isn't a regression for existing users of git 'master', I see no reason to hold off on merging to 'master'. Thanks for your patient help. Sincerely, Jonathan