summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2016-08-08 21:03:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-11 19:41:46 (GMT)
commitf07a9f7643c8b261b5d03d9c288c44916277f05e (patch)
tree1c15ccf83418f8500be662840e237daf9dd88caf /ll-merge.h
parent71501a71d0431ade410afa618adf55806e1f5f11 (diff)
downloadgit-f07a9f7643c8b261b5d03d9c288c44916277f05e.zip
git-f07a9f7643c8b261b5d03d9c288c44916277f05e.tar.gz
git-f07a9f7643c8b261b5d03d9c288c44916277f05e.tar.bz2
builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
To libify `git apply` functionality we have to signal errors to the caller instead of die()ing. As a first step in this direction, let's make apply_patch() return -1 or -128 in case of errors instead of dying. For now its only caller apply_all_patches() will exit(128) when apply_patch() return -128 and it will exit(1) when it returns -1. We exit() with code 128 because that was what die() was doing and we want to keep the distinction between exiting with code 1 and exiting with code 128. 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 'll-merge.h')
0 files changed, 0 insertions, 0 deletions