| commit | 203a2fe117070964a5bf7cc940a742cad7a19fca | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Thu, 7 Feb 2008 16:39:48 +0000 (7 11:39 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Feb 2008 07:16:51 +0000 (9 23:16 -0800) | ||
| tree | fc0b78c0020f32ff1d55e31aca3ef4fba0a34574 | treesnapshot (tar.gz zip) |
| parent | 9cb76b8cdc8ac62a77080595f6443613fd64bab3 | commitdiff |
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>
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 | diffblobblamehistory | |
| builtin-read-tree.c | diffblobblamehistory | |
| diff-lib.c | diffblobblamehistory | |
| unpack-trees.c | diffblobblamehistory |