undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: allow write_tree_from_memory() to error out

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-07-26 18:06:17 +02:00 committed by Junio C Hamano
parent 3c8a51e89a
commit fbc87eb544
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -1888,8 +1888,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;
}