From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: [PATCH 4/4] merge-recursive: Avoid showing conflicts with merge branch before HEAD
Date: Mon, 15 Oct 2018 14:23:15 +0900 [thread overview]
Message-ID: <xmqqzhvf4wcc.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181012212551.7689-5-newren@gmail.com> (Elijah Newren's message of "Fri, 12 Oct 2018 14:25:51 -0700")
Elijah Newren <newren@gmail.com> writes:
> The correct order usually comes naturally and for free, but with renames
> we often have data in the form {rename_branch, other_branch}, and
> working relative to the rename first (e.g. for rename/add) is more
> convenient elsewhere in the code. Address the slight impedance
> mismatch by having some functions re-call themselves with flipped
> arguments when the branch order is reversed.
I've never noticed or felt disturbed myself, but thanks for this
level of attention to the detail.
> @@ -228,7 +228,26 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
> struct stage_data *src_entry1,
> struct stage_data *src_entry2)
> {
> - struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
> + struct rename_conflict_info *ci;
> +
> + /*
> + * When we have two renames involved, it's easiest to get the
> + * correct things into stage 2 and 3, and to make sure that the
> + * content merge puts HEAD before the other branch if we just
> + * ensure that branch1 == o->branch1. So, simply flip arguments
> + * around if we don't have that.
> + */
> + if (dst_entry2 && branch1 != o->branch1) {
> + setup_rename_conflict_info(rename_type,
> + pair2, pair1,
> + branch2, branch1,
> + dst_entry2, dst_entry1,
> + o,
> + src_entry2, src_entry1);
> + return;
> + }
;-)
next prev parent reply other threads:[~2018-10-15 5:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 21:25 [PATCH 0/4] More merge cleanups Elijah Newren
2018-10-12 21:25 ` [PATCH 1/4] t6036: add testcase where virtual merge base contains nested conflicts Elijah Newren
2018-10-12 21:25 ` [PATCH 2/4] merge-recursive: increase marker length with depth of recursion Elijah Newren
2018-10-15 5:12 ` Junio C Hamano
2018-10-15 15:02 ` Elijah Newren
2018-10-16 2:16 ` Junio C Hamano
2018-10-16 18:00 ` Elijah Newren
2018-10-12 21:25 ` [PATCH 3/4] merge-recursive: improve auto-merging messages with path collisions Elijah Newren
2018-10-15 5:18 ` Junio C Hamano
2018-10-12 21:25 ` [PATCH 4/4] merge-recursive: Avoid showing conflicts with merge branch before HEAD Elijah Newren
2018-10-15 5:23 ` Junio C Hamano [this message]
2018-10-16 20:19 ` [PATCH v2 0/2] More merge cleanups Elijah Newren
2018-10-16 20:19 ` [PATCH v2 1/2] merge-recursive: improve auto-merging messages with path collisions Elijah Newren
2018-10-16 20:19 ` [PATCH v2 2/2] merge-recursive: avoid showing conflicts with merge branch before HEAD Elijah Newren
2018-10-18 6:09 ` Junio C Hamano
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=xmqqzhvf4wcc.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).