| commit | 0eb8d3767c8f5c87f3bdcbbf9d3d5f73c39422d9 | |
| author | Jeff King <peff@peff.net> | |
| Mon, 5 Nov 2018 06:43:44 +0000 (5 01:43 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Nov 2018 03:55:36 +0000 (6 12:55 +0900) | ||
| tree | 4561e716a7b5816df4aeabae3c7c4882ce9af91c | treesnapshot (tar.gz zip) |
| parent | 1f5db32d89b62317cf59486d14e8b2d4d004cd1e | commitdiff |
cat-file: report an error on multiple --batch options
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/cat-file.c | diffblobblamehistory |