diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2008-02-07 11:39:48 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-09 23:16:51 -0800 |
| commit | 203a2fe117070964a5bf7cc940a742cad7a19fca (patch) | |
| tree | fc0b78c0020f32ff1d55e31aca3ef4fba0a34574 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | lazy index hashing (diff) | |
| download | git-203a2fe117070964a5bf7cc940a742cad7a19fca.tar.gz git-203a2fe117070964a5bf7cc940a742cad7a19fca.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions