From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: en/present-despite-skipped (Re: What's cooking in git.git (Feb 2022, #05; Thu, 17))
Date: Tue, 22 Feb 2022 15:52:10 -0800 [thread overview]
Message-ID: <YhV3KruSTFYEDBAO@google.com> (raw)
In-Reply-To: <YhBNgUFnujFGVcRo@google.com>
Jonathan Nieder wrote:
> Junio C Hamano wrote:
>> * en/present-despite-skipped (2022-01-14) 6 commits
>> (merged to 'next' on 2022-02-15 at 960873fdad)
>> + Accelerate clear_skip_worktree_from_present_files() by caching
>> + Update documentation related to sparsity and the skip-worktree bit
>> + repo_read_index: clear SKIP_WORKTREE bit from files present in worktree
>> + unpack-trees: fix accidental loss of user changes
>> + t1011: add testcase demonstrating accidental loss of user modifications
>> + Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped
>>
>> In sparse-checkouts, files mis-marked as missing from the working tree
>> could lead to later problems. Such files were hard to discover, and
>> harder to correct. Automatically detecting and correcting the marking
>> of such files has been added to avoid these problems.
>>
>> Will merge to 'master'.
>> cf. <20220204081336.3194538-1-newren@gmail.com>
>> source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
>
> I'd recommend holding off on merging to 'master' for now, until we
> figure out what to do about
> https://lore.kernel.org/git/YhBCsg2DCEd9FXjE@google.com/. Hopefully that
> won't take long.
Since as discussed there this isn't a regression for existing users of
git 'master', I see no reason to hold off on merging to 'master'.
Thanks for your patient help.
Sincerely,
Jonathan
next prev parent reply other threads:[~2022-02-22 23:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 1:13 What's cooking in git.git (Feb 2022, #05; Thu, 17) Junio C Hamano
2022-02-18 2:49 ` gc/recursive-fetch-with-unused-submodules (was Re: What's cooking in git.git (Feb 2022, #05; Thu, 17)) Glen Choo
2022-02-18 16:51 ` Junio C Hamano
2022-02-18 3:28 ` What's cooking in git.git (Feb 2022, #05; Thu, 17) Elijah Newren
2022-02-18 16:51 ` Junio C Hamano
2022-02-18 5:19 ` ds/core-untrac[k]ed-cache-config (Was: Re: What's cooking in git.git (Feb 2022, #05; Thu, 17)) Elijah Newren
2022-02-18 16:50 ` ds/core-untrac[k]ed-cache-config Junio C Hamano
2022-02-19 1:53 ` en/present-despite-skipped (Re: What's cooking in git.git (Feb 2022, #05; Thu, 17)) Jonathan Nieder
2022-02-22 23:52 ` Jonathan Nieder [this message]
2022-02-23 19:39 ` Junio C Hamano
2022-02-25 16:43 ` Jonathan Nieder
2022-02-21 11:14 ` pw/single-key-interactive (was " Phillip Wood
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=YhV3KruSTFYEDBAO@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@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).