From: Christian Couder <christian.couder@gmail.com>
Date: Mon, 8 Aug 2016 21:03:16 +0000 (+0200)
Subject: builtin/apply: make build_fake_ancestor() return -1 on error
X-Git-Tag: v2.14.0-rc0~29^2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe41b8022560e24c1617cc8b3bd11b72bd1ff4bd?hp=fe41b8022560e24c1617cc8b3bd11b72bd1ff4bd

builtin/apply: make build_fake_ancestor() return -1 on error

To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.

To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", build_fake_ancestor() should return -1 instead
of calling die().

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---