From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 15:56:10 GMT
Subject: Re: [PATCH v2 04/20] merge-recursive: exit early if index != head
Message-ID: <xmqqy30gvnqd.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BHKWV6pNk_72xVTr5-rJ6n71Q9=SFa2H75_FUhJ8DrUQQ@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> On Fri, Jul 26, 2019 at 12:32 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Elijah Newren <newren@gmail.com> writes:
>>
>> > Make sure we do the index == head check at the beginning of the merge,
>> > and error out immediately if it fails.  While we're at it, fix a small
>> > leak in the show-the-error codepath.
>>
>> As the call to repo_index_has_changes() is moved to the very
>> beginning of merge_recursive() and merge_trees(), the workhorse of
>> the merge machinery, merge_trees_internal(), can lose it.
>
> Is this just a re-summarization (a perfectly good one), or a
> suggestion for alternate wording for the commit message?

The usual "thinking aloud to see if I understood the patch and the
author's thought behind it, and give others a chance to correct me"
kind of review.