diff options
| author | Jeff King <peff@peff.net> | 2023-12-07 08:25:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-09 00:26:22 +0100 |
| commit | 92cecce0de87aa8cc54c3a9671554cb64a7c72fa (patch) | |
| tree | f18dd789fd425fd9f03d422bc9be8e9f7d51970a /merge-ll.c | |
| parent | imap-send: don't use git_die_config() inside callback (diff) | |
| download | git-92cecce0de87aa8cc54c3a9671554cb64a7c72fa.tar.xz git-92cecce0de87aa8cc54c3a9671554cb64a7c72fa.zip | |
config: use config_error_nonbool() instead of custom messages
A few config callbacks use their own custom messages to report an
unexpected implicit bool like:
[merge "foo"]
driver
These should just use config_error_nonbool(), so the user sees
consistent messages.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ll.c')
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ll.c b/merge-ll.c index 8fcf2d3710..1df58ebaac 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -301,7 +301,7 @@ static int read_merge_config(const char *var, const char *value, if (!strcmp("driver", key)) { if (!value) - return error("%s: lacks value", var); + return config_error_nonbool(var); /* * merge.<name>.driver specifies the command line: * |