From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, a.krey@gmx.de
Subject: Re: [PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge
Date: Fri, 22 Dec 2017 12:38:20 -0800 [thread overview]
Message-ID: <xmqqh8siqz0j.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20171221191907.4251-3-newren@gmail.com> (Elijah Newren's message of "Thu, 21 Dec 2017 11:19:07 -0800")
Elijah Newren <newren@gmail.com> writes:
> builtin/merge.c contains this important requirement for merge strategies:
> /*
> * At this point, we need a real merge. No matter what strategy
> * we use, it would operate on the index, possibly affecting the
> * working tree, and when resolved cleanly, have the desired
> * tree in the index -- this means that the index must be in
> * sync with the head commit. The strategies are responsible
> * to ensure this.
> */
>
> merge-recursive does not do this check directly, instead it relies on
> unpack_trees() to do it. However, merge_trees() has a special check for
> the merge branch exactly matching the merge base; when it detects that
> situation, it returns early without calling unpack_trees(), because it
> knows that the HEAD commit already has the correct result. Unfortunately,
> it didn't check that the index matched HEAD, so after it returned, the
> outer logic ended up creating a merge commit that included something
> other than HEAD.
Good.
I actually was imagining that you would shoot for creating an empty
commit and leaving a working tree and the index that are both dirty,
but I do not think it is worth the effort. Besides, "you have to
start from a clean index" is a much simpler rule to explain than
with "unless the resulting tree is the same as HEAD", especially
when that "unless" is highly unlikely to happen anyway.
Thanks.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> merge-recursive.c | 7 +++++++
> t/t6044-merge-unrelated-index-changes.sh | 2 +-
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 2ecf495cc2..780f81a8bd 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1952,6 +1952,13 @@ int merge_trees(struct merge_options *o,
> }
>
> if (oid_eq(&common->object.oid, &merge->object.oid)) {
> + struct strbuf sb = STRBUF_INIT;
> +
> + if (index_has_changes(&sb)) {
> + err(o, _("Dirty index: cannot merge (dirty: %s)"),
> + sb.buf);
> + return 0;
> + }
> output(o, 0, _("Already up to date!"));
> *result = head;
> return 1;
> diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
> index 5e472be92b..23b86fb977 100755
> --- a/t/t6044-merge-unrelated-index-changes.sh
> +++ b/t/t6044-merge-unrelated-index-changes.sh
> @@ -112,7 +112,7 @@ test_expect_success 'recursive' '
> test_must_fail git merge -s recursive C^0
> '
>
> -test_expect_failure 'recursive, when merge branch matches merge base' '
> +test_expect_success 'recursive, when merge branch matches merge base' '
> git reset --hard &&
> git checkout B^0 &&
next prev parent reply other threads:[~2017-12-22 20:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 11:43 git merge commits staged files (when two trees are identical) Andreas Krey
2017-12-21 18:50 ` Elijah Newren
2017-12-21 19:19 ` [PATCH 1/3] t6044: recursive can silently incorporate dirty changes in a merge Elijah Newren
2017-12-21 19:19 ` [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse Elijah Newren
2017-12-21 19:36 ` Elijah Newren
2017-12-22 20:46 ` Junio C Hamano
2017-12-23 2:26 ` Elijah Newren
2017-12-21 19:19 ` [PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge Elijah Newren
2017-12-22 20:38 ` Junio C Hamano [this message]
2018-01-08 20:37 ` Junio C Hamano
2018-01-09 18:19 ` [PATCH] merge-recursive: do not look at the index during recursive merge Junio C Hamano
2018-01-09 18:25 ` Junio C Hamano
2018-01-09 18:27 ` Eric Sunshine
2018-01-09 18:29 ` Elijah Newren
2018-01-09 18:49 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh8siqz0j.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=a.krey@gmx.de \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.