From 2f5a6d1218de4dfa326ff289b784d3e293b8141f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 8 Aug 2016 23:03:08 +0200 Subject: apply: make init_apply_state() return -1 instead of exit()ing To libify `git apply` functionality we have to signal errors to the caller instead of exit()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", init_apply_state() should return -1 instead of calling exit(). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/apply.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'builtin') diff --git a/builtin/apply.c b/builtin/apply.c index bb6ff77038..61fd316363 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4741,7 +4741,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix) OPT_END() }; - init_apply_state(&state, prefix, &lock_file); + if (init_apply_state(&state, prefix, &lock_file)) + exit(128); argc = parse_options(argc, argv, state.prefix, builtin_apply_options, apply_usage, 0); -- cgit v1.3-5-g9baa