On 7/28/2021 10:57 PM, Elijah Newren wrote: > On Wed, Jul 28, 2021 at 8:03 PM Derrick Stolee <stolee@xxxxxxxxx> wrote: >> >> On 7/28/2021 7:13 PM, Elijah Newren wrote: >>> On Mon, Jul 26, 2021 at 9:18 AM Derrick Stolee via GitGitGadget >>> <gitgitgadget@xxxxxxxxx> wrote: >> ... >>>> * a full proposal for what to do with "git (add|mv|rm)" and paths outside >>>> the cone is delayed to another series (with an RFC round) because the >>>> behavior of the sparse-index matches a full index with sparse-checkout. >>> >>> I think this makes sense. >>> >>> I've read through the patches, and I like this version...with one >>> exception. Can we mark the test added in patch 1 under >>> >>> # 3. Rename the file to another sparse filename and >>> # accept conflict markers as resolved content. >>> >>> as NEEDSWORK or even MAYNEEDWORK? >> >> I have no objection to adding a blurb such as: >> >> # NEEDSWORK: allowing adds outside the sparse cone can be >> # confusingto users, as the file can disappear from the >> # worktree without warning in later Git commands. >> > > Sounds great to me other than the simple typo (s/confusingto/confusing to/) > >> And perhaps I'm misunderstanding the situation a bit, but that >> seems to apply not just to this third case, but all of them. I >> don't see why the untracked case is special compared to the >> tracked case. More investigation may be required on my part. > > The possible cases for files outside the sparsity patterns are: > a) untracked > b) tracked and SKIP_WORKTREE > c) tracked and !SKIP_WORKTREE (e.g. because merge conflicts) > > From the above set, we've been talking about untracked and I think > we're on the same page about those. Case (b) was already corrected by > Matheus a number of releases back; git-add will throw an error > explaining the situation and prevent the adding. The error tells the > user to expand their sparsity set to work on those files. For case > (c), you are right that those are problematic in the same way (they > can disappear later after a git-add)...but we're also in the situation > where the only way to get rid of the conflicting stages is to run git > add. So, in my mind, case (c) puts us between a rock and a hard > place, and we probably need to allow the git-add. I appreciate this additional context. Thanks. >>> I'm still quite unconvinced that it >>> is testing for correct behavior, and don't want to paint ourselves >>> into a corner. In particular, we don't allow folks to "git add >>> $IGNORED_FILE" without a --force override because it's likely to be a >>> mistake. >> >> I agree about ignored files, and that is true whether or not they >> are in the sparse cone. > > Yes, and... > >>> I think the same logic holds for adding untracked files >>> outside the sparsity cone. > > In my opinion, "outside the sparsity cone" is another form of "being > ignored", and in my mind should be treated similarly -- it should > generally require an override to add such files. (Case (c) possibly > being an exception, though maybe even it shouldn't be.) I don't hold that same interpretation. I think of it instead as "hidden" files, but they still matter. I also think that advising one to adjust their sparsity patterns might be dangerous because not all users know the ramifications of doing that. They might accidentally download an enormous amount of data to correct a single file. Having an override seems like the best option, and we can hopefully make it consistent across all the cases and commands. ... > Trying to get out of a corner we paint ourselves into with > sparse-checkout would be massively harder, which is why I keep harping > on this kind of thing. I'm very concerned it's happening even despite > my numerous comments and worries about it. ... > I'm totally fine with such changes not being part of this series. I > just don't want a test_expect_success that checks for behavior that I > consider buggy unless it comes with a disclaimer that it's checking > for existing rather than expected behavior. I understand your perspective. I'll send a v3 soon that adds a comment on top of the entire test signalling the things we talked about here: this is a documentation of behavior, not an endorsement, and we should probably change it because users can get confused. Thanks, -Stolee
