summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-08-08 23:03:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-11 12:41:47 -0700
commitfe41b8022560e24c1617cc8b3bd11b72bd1ff4bd (patch)
tree949f5509c59f30bb72324f2fae1286840ed3d0fa /xdiff-interface.c
parentbuiltin/apply: change die_on_unsafe_path() to check_unsafe_path() (diff)
downloadtgif-fe41b8022560e24c1617cc8b3bd11b72bd1ff4bd.tar.xz
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>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions