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

peff · gitster · commit 735ca208c546 · 2018-11-06T12:55:36.000+09:00
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 aaf6c44 (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>
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4812,7 +4812,7 @@ static int apply_option_parse_whitespace(const struct option *opt,`
`4812`	`4812`	`struct apply_state *state = opt->value;`
`4813`	`4813`	`state->whitespace_option = arg;`
`4814`	`4814`	`if (parse_whitespace_option(state, arg))`
`4815`		`- exit(1);`
	`4815`	`+ return -1;`
`4816`	`4816`	`return 0;`
`4817`	`4817`	`}`
`4818`	`4818`