On Fri, Feb 11, 2022 at 11:51 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > Derrick Stolee <stolee@xxxxxxxxx> writes: > > On 2/9/2022 7:12 PM, Junio C Hamano wrote: > >> * ds/sparse-checkout-requires-per-worktree-config (2022-02-08) 6 commits > >> Will merge to 'next'? > > > > You and I have had a good discussion about the latest version. I > > think we've mostly landed on finding ways to improve documentation > > in other ways (including the patch you submitted), but here are > > the things that I see as still outstanding: > > With the maintainer hat on, I agree that all are good points. From > a reviewer's point of view, I do not care too deeply about 1 or 2 > myself though. Agreed. > > 0. Eric mentioned earlier that he was interested in looking again, > > but has not signaled that his review is complete. I have now read through the most recent version and left one or two minor comments, but probably nothing actionable. > > 1. You and Eric disagree about the use of "worktree" and "working > > tree" in the documentation. I could revert the change to these > > docs from v5 to v6. I wouldn't go so far as to characterize it as a disagreement. In my review, I only pointed out that this series was introducing some new instances of inconsistency which some earlier efforts (started by Michael Haggerty) had eliminated. As mentioned in [2], I personally prefer the term "worktree". [1]: https://lore.kernel.org/git/CAPig+cS-3CxxyPGcy_vkeN_WYTRo1b-ZhJNdPy8ARZSNKkF1Xg@xxxxxxxxxxxxxx/ [2]: https://lore.kernel.org/git/CAPig+cSY7E_XQC1gHzDJxoDGGmgWDmNz9Ys=CwbhLkCt+DQf-A@xxxxxxxxxxxxxx/ > > 2. You mention that the changes in config.c could be split into > > two (first, create repo_config_set_multivar_gently() and then > > create repo_config_set_worktree_gently()). > > > > 3. Jean-Noël noticed an improvement to reduce work on translators. > > The diff below could be squashed into patch 5 OR I could submit > > it as a forward fix.