[PATCH v3 08/16] merge-recursive: allow write_tree_from_memory() to error out
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 7, 2016, 14:35 UTC
- Message-ID
- <fc331704b5d9fdf58bded97eaf4ac866998180d8.1467902083.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1467902082.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 d9221ce..09f4e27 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1903,8 +1903,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.278.g1caae67