]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4a37b80) | patch
xdiff: handle allocation failure when merging
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Wed, 16 Feb 2022 10:15:09 +0000 (10:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2022 18:58:16 +0000 (10:58 -0800)
commit43ad3af380702d9e304140f259480de59320e587
tree157c8f9dcf5f4dda0d8985430310865116f3143ctree | snapshot
parent4a37b80e88f8f26a2f56d77c5ad6caa41d572ea8commit | diff
xdiff: handle allocation failure when merging

Other users of xdiff such as libgit2 need to be able to handle
allocation failures. These allocation failures were previously
ignored.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
xdiff/xmerge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.