From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: en/remerge-diff (was: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)))
Date: Fri, 04 Feb 2022 12:20:04 +0100 [thread overview]
Message-ID: <220204.86czk250zv.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <20220204081336.3194538-1-newren@gmail.com>
On Fri, Feb 04 2022, Elijah Newren wrote:
> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano <gitster@pobox.com> wrote:
> [...]
>> * en/remerge-diff (2022-02-02) 11 commits
>> - diff-merges: avoid history simplifications when diffing merges
>> - 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
>> (this branch is used by en/merge-tree.)
>>
>> "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.v5.git.1643769457.gitgitgadget@gmail.com>
>
> Ævar's recent opinion on the state of the series was "I think this is
> way past good enough."[*]. He's the only reviewer that has commented
> since December, leading me to believe the half-dozen or so other
> earlier reviewers since August are content with the current shape.
>
> [*] https://lore.kernel.org/git/220202.868rut8qkf.gmgdl@evledraar.gmail.com/
Yes, I'd really like to have this merged down. I didn't comment on your
v4/v5 re-rolls but everything there looks good to me and addresses any
outstanding comments I had (to the extent that they needed to be
addressed at all).
In particular the small addition to the docs to give us a way out out if
we need to improve this in combination with other options is good, and
much better than my proposed (and more verbose) version.
Thanks!
next prev parent reply other threads:[~2022-02-04 11:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 5:22 What's cooking in git.git (Feb 2022, #01; Thu, 3) Junio C Hamano
2022-02-04 7:00 ` Eric Sunshine
2022-02-05 8:00 ` Junio C Hamano
2022-02-04 8:13 ` Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Elijah Newren
2022-02-04 11:20 ` Ævar Arnfjörð Bjarmason [this message]
2022-02-04 16:42 ` en/remerge-diff Junio C Hamano
2022-02-06 11:41 ` Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Eric Sunshine
2022-02-09 14:57 ` Derrick Stolee
2022-02-07 14:11 ` Phillip Wood
2022-02-04 11:25 ` jc/doc-log-messages (was: " Ævar Arnfjörð Bjarmason
2022-02-04 12:23 ` rj/receive-pack-abort-upon-disconnect " Ævar Arnfjörð Bjarmason
2022-02-04 12:25 ` cb/clear-quarantine-early-on-all-ref-update-errors " Ævar Arnfjörð Bjarmason
2022-02-04 16:45 ` cb/clear-quarantine-early-on-all-ref-update-errors Junio C Hamano
2022-02-04 12:29 ` ja/i18n-common-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Ævar Arnfjörð Bjarmason
2022-02-04 16:56 ` ja/i18n-common-messages Junio C Hamano
2022-02-05 12:18 ` ja/i18n-common-messages Jean-Noël AVILA
2022-02-06 8:12 ` ja/i18n-common-messages Bagas Sanjaya
2022-02-06 10:03 ` ja/i18n-common-messages Jean-Noël AVILA
2022-02-04 12:31 ` ps/avoid-unnecessary-hook-invocation-with-packed-refs (was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Ævar Arnfjörð Bjarmason
2022-02-04 12:36 ` ab/ambiguous-object-name " Ævar Arnfjörð Bjarmason
2022-02-04 13:05 ` tl/ls-tree-oid-only " Ævar Arnfjörð Bjarmason
2022-02-04 13:11 ` ab/only-single-progress-at-once " Ævar Arnfjörð Bjarmason
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=220204.86czk250zv.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).