From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Jose Lopes" <jabolopes@google.com>,
"Jeff Hostetler" <jeffhostetler@github.com>,
"Derrick Stolee" <derrickstolee@github.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v5] repo_read_index: add config to expect files outside sparse patterns
Date: Wed, 2 Mar 2022 00:01:34 -0800 [thread overview]
Message-ID: <CABPp-BFqJGHDMz744Q7FV22tW6dpGNoBwAW=P1HZE6PtZeHN6A@mail.gmail.com> (raw)
In-Reply-To: <xmqq1qzkolet.fsf@gitster.g>
On Tue, Mar 1, 2022 at 11:37 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Elijah Newren <newren@gmail.com> writes:
>
> > Typically with sparse checkouts, we expect files outside the sparsity
> > patterns to be marked as SKIP_WORKTREE and be missing from the working
> > tree. Sometimes this expectation would be violated however; including
> > in cases such as:
> > * users grabbing files from elsewhere and writing them to the worktree
> > (perhaps by editing a cached copy in an editor, copying/renaming, or
> > even untarring)
> > * various git commands having incomplete or no support for the
> > SKIP_WORKTREE bit[1,2]
> > * users attempting to "abort" a sparse-checkout operation with a
> > not-so-early Ctrl+C (updating $GIT_DIR/info/sparse-checkout and the
> > working tree is not atomic)[3].
> > When the SKIP_WORKTREE bit in the index did not reflect the presence of
> > the file in the working tree, it traditionally caused confusion and was
> > difficult to detect and recover from. So, in a sparse checkout, since
> > af6a51875a ("repo_read_index: clear SKIP_WORKTREE bit from files present
> > in worktree", 2022-01-06), Git automatically clears the SKIP_WORKTREE
>
> The reference is a bit off here. Here is what I get locally:
>
> af6a51875a (repo_read_index: clear SKIP_WORKTREE bit from files
> present in worktree, 2022-01-14)
>
> and that is in the version I have locally in 'next'.
Ugh, forgot to update the date when I updated the reference when you
pointed that out.
> > [1] https://lore.kernel.org/git/xmqqbmb1a7ga.fsf@gitster-ct.c.googlers.com/
> > [2] The three long paragraphs in the middle of
> > https://lore.kernel.org/git/CABPp-BH9tju7WVm=QZDOvaMDdZbpNXrVWQdN-jmfN8wC6YVhmw@mail.gmail.com/
> > [3] https://lore.kernel.org/git/CABPp-BFnFpzwGC11TLoLs8YK5yiisA5D5-fFjXnJsbESVDwZsA@mail.gmail.com/
> > [4] such as the vfsd described in
>
> Here is another difference from the version I have locally in
> 'next', which I didn't notice that this [4] was misspelt as [1]
> before applying.
Sorry, I hadn't noticed you merging to next, and I saw in the irc logs
the discussion about this 1 vs. 4 between you and jrnieder so I
thought I'd fix it.
> Everything else seems the same, so let's not bother reverting the
> old one out of 'next' and merging this version after fixing this
> version up. What we have is good enough modulo [4] vs [1].
Sounds good.
next prev parent reply other threads:[~2022-03-02 8:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-20 5:05 [PATCH] Provide config option to expect files outside sparse patterns Elijah Newren via GitGitGadget
2022-02-20 19:41 ` Derrick Stolee
2022-02-20 20:16 ` Junio C Hamano
2022-02-22 2:17 ` Elijah Newren
2022-02-22 12:28 ` Johannes Schindelin
2022-02-22 13:43 ` Derrick Stolee
2022-02-21 20:34 ` Johannes Schindelin
2022-02-21 22:53 ` Ævar Arnfjörð Bjarmason
2022-02-22 2:25 ` Elijah Newren
2022-02-22 12:13 ` Johannes Schindelin
2022-02-22 12:57 ` Ævar Arnfjörð Bjarmason
2022-02-22 23:13 ` Jonathan Nieder
2022-02-25 16:39 ` Ævar Arnfjörð Bjarmason
2022-02-22 2:23 ` Elijah Newren
2022-02-22 10:05 ` Ævar Arnfjörð Bjarmason
2022-02-22 12:11 ` Johannes Schindelin
2022-02-22 13:47 ` Derrick Stolee
2022-02-23 2:26 ` [PATCH v2] repo_read_index: add config " Jonathan Nieder
2022-02-23 3:10 ` Elijah Newren
2022-02-24 5:22 ` [PATCH v3] " Elijah Newren
2022-02-24 18:24 ` Junio C Hamano
2022-02-26 5:58 ` Elijah Newren
2022-02-25 16:33 ` Jonathan Nieder
2022-02-26 6:01 ` Elijah Newren
2022-02-26 6:12 ` [PATCH v4] " Elijah Newren
2022-03-02 4:33 ` [PATCH v5] " Elijah Newren
2022-03-02 7:36 ` Junio C Hamano
2022-03-02 8:01 ` Elijah Newren [this message]
2022-03-02 13:37 ` [PATCH v4] " 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='CABPp-BFqJGHDMz744Q7FV22tW6dpGNoBwAW=P1HZE6PtZeHN6A@mail.gmail.com' \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jabolopes@google.com \
--cc=jeffhostetler@github.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@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).