From: "Tim Renouf (open source)" <tpr.ll@botech.co.uk>
To: Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <stolee@gmail.com>,
Derrick Stolee <dstolee@microsoft.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] unpack-trees: add core.sparseCheckoutRmFiles config
Date: Wed, 2 Jun 2021 07:13:57 +0100 [thread overview]
Message-ID: <9BCB8981-09D5-4BF4-981B-2BF0AA0D6E5A@botech.co.uk> (raw)
In-Reply-To: <CABPp-BHs0ACvkCJMB-tO8xkiidB12NrN1hOhLRvm3U_Q=r2YcQ@mail.gmail.com>
Hi all
Thanks for the reviews and comments.
My use case is that I never want it to remove or otherwise touch those files outside of sparse-checkout that happen to be the same path as index paths. I realize that currently gives me complications (e.g. I must never try and merge/cherry-pick/rebase a commit that might cause a merge conflict out there), and I realize that’s not what everyone else wants. For example, I don’t want git reset --hard or whatever to remove those files. Hence the config option.
Am I right in saying that the sparse-index work makes it easier to achieve my use case? In that those outside-sparse-checkout paths would not ever get merged into the index, even if I merge/cherry-pick/rebase a tree with paths there?
I can go into more details on how I arrived ay my use case if it helps.
So maybe there are two separate things here:
1. The bug that checkout removes my file when it is dirty, instead of refusing (unless -f) or just ignoring it.
2. My use case, which is to do its best to never remove or otherwise touch worktree files outside sparse-checkout.
> I'm also worried that making a config option may have masked subtle
> bugs in the patch that the rest of the testsuite would have turned up.
It is true that not hiding it in a config option makes a few tests fail, including ones that specifically test that a git reset after a materialization from a merge conflict causes the file to be removed.
Thanks.
-tpr
next prev parent reply other threads:[~2021-06-02 6:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 20:14 bug report: git checkout deletes worktree file even though it is excluded by sparse-checkout Tim Renouf (open source)
2021-05-28 22:44 ` Elijah Newren
2021-06-01 18:31 ` [PATCH] unpack-trees: add core.sparseCheckoutRmFiles config Tim Renouf
2021-06-02 2:00 ` Derrick Stolee
2021-06-02 2:32 ` Junio C Hamano
2021-06-02 5:53 ` Elijah Newren
2021-06-02 6:13 ` Tim Renouf (open source) [this message]
2021-06-02 23:41 ` Elijah Newren
2021-06-05 15:33 ` Tim Renouf (open source)
2021-06-02 1:37 ` bug report: git checkout deletes worktree file even though it is excluded by sparse-checkout Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9BCB8981-09D5-4BF4-981B-2BF0AA0D6E5A@botech.co.uk \
--to=tpr.ll@botech.co.uk \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=stolee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).