mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add color.ui variable which globally enables colorization if set

Browse Source 
Signed-off-by: Matthias Kestenholz <mk@spinlock.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthias Kestenholz
2008-02-18 08:26:03 +01:00
committed by Junio C Hamano
parent cf5c51efc9
commit 6b2f2d9805
10 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -20,7 +20,7 @@
static int diff_detect_rename_default;
static int diff_rename_limit_default = 100;
static int diff_use_color_default;
int diff_use_color_default = -1;
static const char *external_diff_cmd_cfg;
int diff_auto_refresh_index = 1;
@ -191,7 +191,7 @@ int git_diff_basic_config(const char *var, const char *value)
}
}
return git_default_config(var, value);
return git_color_default_config(var, value);
}
static char *quote_two(const char *one, const char *two)
@ -2055,7 +2055,7 @@ void diff_setup(struct diff_options *options)
options->change = diff_change;
options->add_remove = diff_addremove;
if (diff_use_color_default)
if (diff_use_color_default > 0)
DIFF_OPT_SET(options, COLOR_DIFF);
else
DIFF_OPT_CLR(options, COLOR_DIFF);