Elijah Newren <newren@xxxxxxxxx> writes: > On Fri, Jul 26, 2019 at 12:32 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: >> >> Elijah Newren <newren@xxxxxxxxx> 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.
