cat-file: report an error on multiple --batch options

peff · gitster · commit 0eb8d3767c8f · 2018-11-06T12:55:36.000+09:00
The options callback for --batch and --batch-check detects when the two
mutually incompatible options are used. But it simply returns an error
code to parse-options, meaning the program will quit without any kind of
message to the user.

Instead, let's use error() to print something and return -1. Note that
this flips the error return from 1 to -1, but negative values are more
idiomatic here (and parse-options treats them the same).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
@@ -596,7 +596,7 @@ static int batch_option_callback(const struct option *opt,
 	struct batch_options *bo = opt->value;
 
 	if (bo->enabled) {
-		return 1;
+		return error(_("only one batch option may be specified"));
 	}
 
 	bo->enabled = 1;

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ static int batch_option_callback(const struct option *opt,`
`596`	`596`	`struct batch_options *bo = opt->value;`
`597`	`597`
`598`	`598`	`if (bo->enabled) {`
`599`		`- return 1;`
	`599`	`+ return error(_("only one batch option may be specified"));`
`600`	`600`	`}`
`601`	`601`
`602`	`602`	`bo->enabled = 1;`