[PATCH 11/13] apply: return -1 from option callback instead of calling exit(1)
- From
Jeff King <peff@peff.net>
- Date
- Nov 5, 2018, 06:43 UTC
- Message-ID
- <20181105064358.GK25864@sigill.intra.peff.net>
- In-Reply-To
- <20181105063718.GA24877@sigill.intra.peff.net>
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> --- apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apply.c b/apply.c index d1ca6addeb..c4c9f849b1 100644 --- a/apply.c +++ b/apply.c @@ -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; }
-- 2.19.1.1505.g9cd28186cf