Allow callers of unpack_trees() to handle failure
authorDaniel Barkalow <barkalow@iabervon.org>
Thu, 7 Feb 2008 16:39:48 +0000 (11:39 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Feb 2008 07:16:51 +0000 (23:16 -0800)
commit203a2fe117070964a5bf7cc940a742cad7a19fca
treefc0b78c0020f32ff1d55e31aca3ef4fba0a34574
parent9cb76b8cdc8ac62a77080595f6443613fd64bab3
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>
builtin-commit.c
builtin-read-tree.c
diff-lib.c
unpack-trees.c