On Mon, Sep 27, 2021 at 1:41 PM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Mon, Sep 27, 2021 at 1:36 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > > > Changes since v2 (all due to Junio's request to consolidate > > > unpack_trees_options.dir handling): > > > > Heh, don't blame me. I even explicitly said it was merely an > > observation for longer term, not a suggestion to include the first > > step for such a move in this series. > > Well...the repetitive code for setting up and clearing out > unpack_trees_options.dir that already existed (and which my series was > copying to more places) bugged me too, but I was worried that it was a > bit messy to clean up (and the fact that it took five patches suggests > it was). But then you also brought it up as an issue when reviewing, > so I figured I might as well dive in... I guess I should add that some of your other review comments were related, e.g. your puzzlement/assumption that some of my changes preserved ignored files when untracked files were being overwritten (which was not what the patches actually did). Trying to make the code clearer was in some ways easier by first consolidating all those other bits.