From 65c8b2df588cb33e0f0ea66bcff3296cb26d7c6b Mon Sep 17 00:00:00 2001 From: John Cai Date: Wed, 8 Feb 2023 16:57:29 -0500 Subject: [PATCH] wip: read config --- diff.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 09a7502bdc522f..eea0f271c6fc42 100644 --- a/diff.c +++ b/diff.c @@ -3667,8 +3667,12 @@ static void builtin_diff(const char *name_a, two_diff_algo = check->items[0].value; if (!ATTR_UNSET(one_diff_algo) && !ATTR_UNSET(two_diff_algo) && - !strcmp(one_diff_algo, two_diff_algo)) - set_diff_algorithm(o, one_diff_algo); + !strcmp(one_diff_algo, two_diff_algo)) { + const char *diff_algorithm; + + if (!git_config_string(&diff_algorithm, one_diff_algo, NULL)) + set_diff_algorithm(o, diff_algorithm); + } attr_check_free(check); }