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>
Jeff King committed
Nov 5, 2018 at 01:43 UTC
735ca208c5463ebbb0991ed02f41b1e30f9dddc1
1 file changed
+1
-1
apply.c
+1
-1
@@ -4812,7 +4812,7 @@ static int apply_option_parse_whitespace(const struct option *opt,
4812
struct apply_state *state = opt->value;
4813
state->whitespace_option = arg;
4814
if (parse_whitespace_option(state, arg))
4815
- exit(1);
4815
+ return -1;
4816
return 0;
4817
}
4818