From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: en/present-despite-skipped & en/remerge-diff (Was: Re: What's cooking in git.git (Jan 2022, #03; Thu, 13))
Date: Fri, 14 Jan 2022 07:54:36 -0800 [thread overview]
Message-ID: <CABPp-BFc=_Gns6oDCDvJ9TjtKYAVhYVq_c74hyZJtL=96GqH=w@mail.gmail.com> (raw)
In-Reply-To: <xmqq35lrf8g4.fsf@gitster.g>
On Fri, Jan 14, 2022 at 7:16 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> * 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.
> * 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/
next prev parent reply other threads:[~2022-01-14 15:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 0:48 What's cooking in git.git (Jan 2022, #03; Thu, 13) Junio C Hamano
2022-01-14 4:18 ` Junio C Hamano
2022-01-14 16:27 ` Elijah Newren
2022-01-14 19:47 ` Junio C Hamano
2022-01-14 21:49 ` Elijah Newren
2022-01-14 22:03 ` Junio C Hamano
2022-01-14 22:18 ` Junio C Hamano
2022-01-14 18:12 ` Ævar Arnfjörð Bjarmason
2022-01-17 7:18 ` Patrick Steinhardt
2022-01-14 15:44 ` Mistakes in the stalled category? (Was: Re: What's cooking in git.git (Jan 2022, #03; Thu, 13)) Elijah Newren
2022-01-14 23:32 ` Mistakes in the stalled category? Junio C Hamano
2022-01-14 23:49 ` Junio C Hamano
2022-01-15 19:38 ` Junio C Hamano
2022-01-18 16:11 ` Derrick Stolee
2022-01-14 15:54 ` Elijah Newren [this message]
2022-01-14 19:39 ` tb/midx-bitmap-corruption-fix (was: Re: What's cooking in git.git (Jan 2022, #03; Thu, 13)) Taylor Blau
2022-01-15 16:45 ` What's cooking in git.git (Jan 2022, #03; Thu, 13) David Aguilar
2022-01-15 19:15 ` Junio C Hamano
2022-01-16 2:15 ` David Aguilar
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-BFc=_Gns6oDCDvJ9TjtKYAVhYVq_c74hyZJtL=96GqH=w@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).