wip: read config

git · Feb 8, 2023 · 65c8b2d · 65c8b2d
1 parent 94b5ef6
commit 65c8b2d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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);
 		}