diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-03 01:30:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 01:30:45 +0300 |
| commit | c18ac30e9ebcf7b7e2fbd992744e63c71089a12a (patch) | |
| tree | 5eb5c1185b0d8bce39356abd801f0a9d7bf802ab /reachable.h | |
| parent | 2b9afea37207323d629953c639542c0e4c87e484 (diff) | |
| parent | 55f39cf7551bd468065306328efdb78933b36b69 (diff) | |
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
Diffstat (limited to 'reachable.h')
0 files changed, 0 insertions, 0 deletions