[PATCH 0/2] Fail merge gently

This series makes it possible to call unpack_trees() and get an error result instead of having it call die(). Additionally, it allows the caller to suppress error messages, in case it's just going to try something else instead of actually failing. This passes all of the tests, and should have no effect on existing code except for making the exit messages not say "fatal:", and merge-recursive will free its tree cache before exiting, and print an additional message already in the code but previously inaccessible.

This is preliminary for builtin-checkout, which I'm partway through. I think I'm down to the case where a real merge is needed for -m, but I'm not sure, and I think I need to write a bunch of tests for checkout.

Daniel Barkalow (2):
      Allow callers of unpack_trees() to handle failure
      Add flag to make unpack_trees() not print errors.

 builtin-read-tree.c |    3 +-
 unpack-trees.c      |   90 ++++++++++++++++++++++++++++++---------------------
 unpack-trees.h      |    1 +
 3 files changed, 56 insertions(+), 38 deletions(-)

	-Daniel
*This .sig left intentionally blank*