en/present-despite-skipped & en/remerge-diff (Was: Re: What's cooking in git.git (Jan 2022, #03; Thu, 13))

From: Elijah Newren <newren@gmail.com>
Date: Jan 14, 2022, 15:54 UTC
Message-ID: <CABPp-BFc=_Gns6oDCDvJ9TjtKYAVhYVq_c74hyZJtL=96GqH=w@mail.gmail.com>
In-Reply-To: <xmqq35lrf8g4.fsf@gitster.g>

On Fri, Jan 14, 2022 at 7:16 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

>
> * en/present-despite-skipped (2022-01-13) 6 commits
>  . 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
>  (this branch uses vd/sparse-clean-etc.)
>
>  With this topic merged, 'seen' seems to fail t1092.
>  source: <pull.1114.git.1642092230.gitgitgadget@gmail.com>

Doh! Sorry about that. I tried to merge with seen to check for semantic conflicts, because this series was more likely to have them than others. That's how I noticed the issue with vd/sparse-clean-etc. But I apparently missed ds/fetch-pull-with-sparse-index. Since the latter has now merged to master and your version of vd/sparse-clean-etc builds on top of a version of master that has ds/fetch-pull-with-sparse-index in it, I can simply submit an updated series and you won't have to merge anything extra into that topic. I'll submit it soon.

Show 17 quoted lines

> * en/remerge-diff (2021-12-30) 10 commits
>  - merge-ort: mark conflict/warning messages from inner merges as omittable
>  - show, log: include conflict/warning messages in --remerge-diff headers
>  - diff: add ability to insert additional headers for paths
>  - merge-ort: format messages slightly different for use in headers
>  - merge-ort: mark a few more conflict messages as omittable
>  - merge-ort: capture and print ll-merge warnings in our preferred fashion
>  - ll-merge: make callers responsible for showing warnings
>  - log: clean unneeded objects during `log --remerge-diff`
>  - show, log: provide a --remerge-diff capability
>  - Merge branch 'ns/tmp-objdir' into en/remerge-diff
>
>  "git log --remerge-diff" shows the difference from mechanical merge
>  result and the merge result that is actually recorded.
>
>  Will merge to 'next'?
>  source: <pull.1103.v3.git.1640907369.gitgitgadget@gmail.com>

Back in September, when you last asked this about an earlier version of this series, I suggested waiting off[1]. Crazy how many things have happened since then. Anyway, this time we've gotten good feedback from multiple reviewers and I've addressed all of it, so this time I think it's ready to merge down.

[1] https://lore.kernel.org/git/CABPp-BH2C5HFw_=NtK71oNGXkntzcJd2un0TgMb=UnJ5yJxAAA@mail.gmail.com/