From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] merge-ort: fix bug with renormalization and rename/delete conflicts
Date: Thu, 30 Dec 2021 14:56:42 -0800 [thread overview]
Message-ID: <xmqqa6ghog5x.fsf@gitster.g> (raw)
In-Reply-To: 78ba0d99-246b-d90c-b725-c084c8304f02@gmail.com
Derrick Stolee <stolee@gmail.com> writes:
> This breakdown of the cases is informative, and I like how self-contained
> the change is.
> ....
>
> This patch looks good to me. Thanks!
>
> Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Thanks, both.
A related tangent, but I was looking at the data structure involved
and noticed that the casting between structure types "merged_info"
and "conflict_info" looked a bit ugly. It might be worth cleaning
them up into
(A) a union with two struct, with "clean" member in the union to
switch between the two structures; or
(B) a single structure that looks like "conflict_info" but inlines
members of "merged_info" into it.
The latter may be cleaner and simpler, and the unified data type
would be the "merge info", which may be representing cleanly merged
path, or conflicted path, and would justify conditional use of some
members based on the value of the .clean member.
next prev parent reply other threads:[~2021-12-30 22:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-28 0:20 [PATCH] merge-ort: fix bug with renormalization and rename/delete conflicts Elijah Newren via GitGitGadget
2021-12-28 13:55 ` Derrick Stolee
2021-12-30 22:56 ` Junio C Hamano [this message]
2021-12-30 23:35 ` Elijah Newren
2021-12-30 22:08 ` [PATCH v2] " Elijah Newren via GitGitGadget
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=xmqqa6ghog5x.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=stolee@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).