[PATCH 0/6] Miscellaneous merge fixes

[Elijah Newren <newren@gmail.com>]

This series has four independent miscellaneous fixes, three split out
from my RFC series at $gmane/291007 and one new fix.  These four fixes
have no dependencies on each other, so I can trivially split them into
four submissions if preferred.  I only batched them because I want my
index-only merge series to be able to simultaneously depend on three
of them.

The first patch is a very minor code cleanup, which has already been
reviewed by Junio.

The second patch is also a minor code cleanup.

The third and fourth patches test and fix a bug with octopus merges.
Since last submitting these patches with my RFC series, I discovered
our documentation used to explicitly state the expectation I enforced
with these patches.  I added a note about that in the commit message.

The fifth and sixth patches test and fix a bug with trivial merges;
these patches are new since my RFC series.


Elijah Newren (6):
  Remove duplicate code
  Avoid checking working copy when creating a virtual merge base
  Add merge testcases for when index doesn't match HEAD
  merge-octopus: Abort if index does not match HEAD
  Add a testcase demonstrating a bug with trivial merges
  builtin/merge.c: Fix a bug with trivial merges

 builtin/merge.c                          |   8 ++
 git-merge-octopus.sh                     |   6 ++
 merge-recursive.c                        |   8 +-
 t/t6044-merge-unrelated-index-changes.sh | 153 +++++++++++++++++++++++++++++++
 t/t7605-merge-resolve.sh                 |   6 +-
 5 files changed, 175 insertions(+), 6 deletions(-)
 create mode 100755 t/t6044-merge-unrelated-index-changes.sh

-- 
2.8.0.21.g229f62a