On Wed, Feb 16, 2022 at 1:47 AM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > > On Tue, Feb 15 2022, Elijah Newren wrote: > > > On Tue, Feb 15, 2022 at 12:01 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> > >> * en/present-despite-skipped (2022-01-14) 6 commits > >> - 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 > >> (this branch uses vd/sparse-clean-etc.) > >> > >> 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 'next'? > >> cf. <20220204081336.3194538-1-newren@xxxxxxxxx> > >> source: <pull.1114.v2.git.1642175983.gitgitgadget@xxxxxxxxx> > > > > Is there anything specific you're looking for here? > > > > I think it's ready, as I said two weeks ago in the link you provided > > above. All reviewer feedback was addressed to reviewers' satisfaction > > over a month ago, so I'm not sure what else to do here... > > FWIW I gave it some light reading just now & left some comments on it. > > I don't think any of them should be blocking on it being merged down to > "next", but perhaps some of them suggest worthwhile follow-ups. In > particular the suggested documentation changes & the behavior/error > checking around the lstat() and index iteration in the new path_found(). You do seem to like waiting until after things merge down to review (Junio merged this 7 hours before your email here). ;-) I can include the documentation changes along with my switching of the default mode in sparse-checkout (i.e. my breaking up and resubmitting [1] in a separate series), especially since the sparse-checkout documentation is be heavily modified in that series anyway. I think the lstat stuff deserves a separate xlstat in wrapper.[ch] if we really want that kind of check everywhere, and seems like a bigger separate refactor. I'm guessing by index iteration it was the part where you got confused on char* vs. char **, and there aren't any changes needed; let me know if my guess on that is wrong. [1] https://lore.kernel.org/git/e30119b96dfaf9fdb82039cab84f8b81caacc1de.1644712798.git.gitgitgadget@xxxxxxxxx/
