apply: return -1 from option callback instead of calling exit(1)

The option callback for "apply --whitespace" exits with status "1" on
error. It makes more sense for it to just return an error to
parse-options. That code will exit, too, but it will use status "129"
that is customary for option errors.

The exit() dates back to aaf6c447aa (builtin/apply: make
parse_whitespace_option() return -1 instead of die()ing, 2016-08-08).
That commit gives no reason why we'd prefer the current exit status (it
looks like it was just bumping the "die" up a level in the callstack,
but did not go as far as it could have).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-11-05 01:43:59 -05:00 committed by Junio C Hamano
parent 0eb8d3767c
commit 735ca208c5

View file

@ -4812,7 +4812,7 @@ static int apply_option_parse_whitespace(const struct option *opt,
struct apply_state *state = opt->value;
state->whitespace_option = arg;
if (parse_whitespace_option(state, arg))
exit(1);
return -1;
return 0;
}