]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c8a51e) | patch
merge-recursive: allow write_tree_from_memory() to error out
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 26 Jul 2016 16:06:17 +0000 (18:06 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jul 2016 18:13:44 +0000 (11:13 -0700)
commitfbc87eb54409b5c7b080f1c23b767daefc9d6ede
tree6b3935a387378544caf4d26f13cef11ed2863cf5tree | snapshot
parent3c8a51e89a90cb2a4016b1c30a10c7245bbdbedacommit | diff
merge-recursive: allow write_tree_from_memory() to error out

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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.