@matheusbsbs / matheus-bagliano / commits / c659f55b31

config: refactor get_colorbool function

For "git config --get-colorbool color.foo", we use a custom callback that looks not only for the key that the user gave us, but also for "diff.color" (for backwards compatibility) and "color.ui" (as a fallback). For the former, we use a custom variable to store the diff.color value. For the latter, though, we store it in the main "git_use_color_default" variable, turning on color.ui for any other parts of git that respect this value. In practice, this doesn't cause any bugs, because git-config runs without caring about git_use_color_default, and then exits. But it crosses module boundaries in an unusual and confusing way, and it makes refactoring color handling harder than it needs to be. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Aug 17, 2011 at 22:04 UTC c659f55b31bb928688afd4ddfd94f8bea978ff1a

1 file changed +3 -2

builtin/config.c

+3 -2

@@ -305,6 +305,7 @@ static void get_color(const char *def_color)

305

306 static int get_colorbool_found;

307 static int get_diff_color_found;

308 +static int get_color_ui_found;

309 static int git_get_colorbool_config(const char *var, const char *value,

310 void *cb)

311 {

@@ -313,7 +314,7 @@ static int git_get_colorbool_config(const char *var, const char *value,

314 else if (!strcmp(var, "diff.color"))

315 get_diff_color_found = git_config_colorbool(var, value);

316 else if (!strcmp(var, "color.ui"))

316 - git_use_color_default = git_config_colorbool(var, value);

317 + get_color_ui_found = git_config_colorbool(var, value);

318 return 0;

319 }

320

@@ -327,7 +328,7 @@ static int get_colorbool(int print)

328 if (!strcmp(get_colorbool_slot, "color.diff"))

329 get_colorbool_found = get_diff_color_found;

330 if (get_colorbool_found < 0)

330 - get_colorbool_found = git_use_color_default;

331 + get_colorbool_found = get_color_ui_found;

332 }

333

334 get_colorbool_found = want_color(get_colorbool_found);