From: Daniel Barkalow <barkalow@iabervon.org>
Date: Thu, 7 Feb 2008 16:39:48 +0000 (-0500)
Subject: Allow callers of unpack_trees() to handle failure
X-Git-Tag: v1.7.6.1~19^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/203a2fe117070964a5bf7cc940a742cad7a19fca?ds=inline;hp=203a2fe117070964a5bf7cc940a742cad7a19fca

Allow callers of unpack_trees() to handle failure

Return an error from unpack_trees() instead of calling die(), and exit
with an error in read-tree, builtin-commit, and diff-lib. merge-recursive
already expected an error return from unpack_trees, so it doesn't need to
be changed. The merge function can return negative to abort.

This will be used in builtin-checkout -m.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
---