@matheusbsbs / matheus-bagliano / commits / 0824879078

diff: give more detailed messages for bogus diff.* config

The config callbacks for a few diff.* variables simply return -1 when we encounter an error. The message you get mentions the offending location, like: fatal: bad config variable 'diff.algorithm' in file '.git/config' at line 7 but is vague about "bad" (as it must be, since the message comes from the generic config code). Most callbacks add their own messages here, so let's do the same. E.g.: error: unknown value for config 'diff.algorithm': foo fatal: bad config variable 'diff.algorithm' in file '.git/config' at line 7 I've written the string in a way that should be reusable for translators, and matches another similar message in transport.c (there doesn't yet seem to be a popular generic message to reuse here, so hopefully this will get the ball rolling). Note that in the case of diff.algorithm, our parse_algorithm_value() helper does detect a NULL value string. But it's still worth detecting it ourselves here, since we can give a more specific error message (and which is the usual one for unexpected implicit-bool values). 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 08248790787e4b6c3e687ca88f727bbdb52fc3a8

1 file changed +6 -2

diff.c

+6 -2

@@ -445,9 +445,12 @@ int git_diff_ui_config(const char *var, const char *value,

445 }

446

447 if (!strcmp(var, "diff.algorithm")) {

448 + if (!value)

449 + return config_error_nonbool(var);

450 diff_algorithm = parse_algorithm_value(value);

451 if (diff_algorithm < 0)

450 - return -1;

452 + return error(_("unknown value for config '%s': %s"),

453 + var, value);

454 return 0;

455 }

456

@@ -486,7 +489,8 @@ int git_diff_basic_config(const char *var, const char *value,

489 return config_error_nonbool(var);

490 val = parse_ws_error_highlight(value);

491 if (val < 0)

489 - return -1;

492 + return error(_("unknown value for config '%s': %s"),

493 + var, value);

494 ws_error_highlight_default = val;

495 return 0;

496 }