Daniel Barkalow 203a2fe117 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>

2008-02-09 23:16:51 -08:00

25 KiB

Raw Blame History

View Raw