[PATCH 6/9] merge-recursive: allow write_tree_from_memory() to error out
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jun 29, 2016, 11:37 UTC
- Message-ID
- <a9646a7f2ea07ecbe1ef22f7360afc8c0d950535.1467199553.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1467199553.git.johannes.schindelin@gmx.de>
It is possible that a tree cannot be written (think: disk full). We will want to give the caller a chance to clean up instead of letting the program die() in such a case.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- merge-recursive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index d56651c9..6ab7dfc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1875,8 +1875,8 @@ int merge_trees(struct merge_options *o, else clean = 1; - if (o->call_depth) - *result = write_tree_from_memory(o); + if (o->call_depth && !(*result = write_tree_from_memory(o))) + return -1; return clean; }
-- 2.9.0.268.gcabc8b0