From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:44 +0000 (-0700)
Subject: Merge branch 'en/dirty-merge-fixes'
X-Git-Tag: v2.19.0-rc0~97
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c18ac30e9ebcf7b7e2fbd992744e63c71089a12a?hp=c18ac30e9ebcf7b7e2fbd992744e63c71089a12a

Merge branch 'en/dirty-merge-fixes'

The recursive merge strategy did not properly ensure there was no
change between HEAD and the index before performing its operation,
which has been corrected.

* en/dirty-merge-fixes:
merge: fix misleading pre-merge check documentation
merge-recursive: enforce rule that index matches head before merging
t6044: add more testcases with staged changes before a merge is invoked
merge-recursive: fix assumption that head tree being merged is HEAD
merge-recursive: make sure when we say we abort that we actually abort
t6044: add a testcase for index matching head, when head doesn't match HEAD
t6044: verify that merges expected to abort actually abort
index_has_changes(): avoid assuming operating on the_index
read-cache.c: move index_has_changes() from merge.c
---