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>
Jeff King committed
Dec 7, 2023 at 02:25 UTC
92cecce0de87aa8cc54c3a9671554cb64a7c72fa
3 files changed
+3
-3
imap-send.c
+1
-1
@@ -1346,7 +1346,7 @@ static int git_imap_config(const char *var, const char *val,
1346
server.port = git_config_int(var, val, ctx->kvi);
1347
else if (!strcmp("imap.host", var)) {
1348
if (!val) {
1349
- return error("Missing value for 'imap.host'");
1349
+ return config_error_nonbool(var);
1350
} else {
1351
if (starts_with(val, "imap:"))
1352
val += 5;
merge-ll.c
+1
-1
@@ -301,7 +301,7 @@ static int read_merge_config(const char *var, const char *value,
301
302
if (!strcmp("driver", key)) {
303
if (!value)
304
- return error("%s: lacks value", var);
304
+ return config_error_nonbool(var);
305
/*
306
* merge.<name>.driver specifies the command line:
307
*
xdiff-interface.c
+1
-1
@@ -314,7 +314,7 @@ int git_xmerge_config(const char *var, const char *value,
314
{
315
if (!strcmp(var, "merge.conflictstyle")) {
316
if (!value)
317
- return error(_("'%s' is not a boolean"), var);
317
+ return config_error_nonbool(var);
318
if (!strcmp(value, "diff3"))
319
git_xmerge_style = XDL_MERGE_DIFF3;
320
else if (!strcmp(value, "zdiff3"))