summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-08-18 05:03:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-18 21:35:53 (GMT)
commitf1c9626105d5e4962a5ccaa4620114d03f32ad02 (patch)
treed777e2316283c1972844977c821091dd77fd6262 /wt-status.c
parent2e6c012e10fd866eb3259de3a929e0296daabbaf (diff)
downloadgit-f1c9626105d5e4962a5ccaa4620114d03f32ad02.zip
git-f1c9626105d5e4962a5ccaa4620114d03f32ad02.tar.gz
git-f1c9626105d5e4962a5ccaa4620114d03f32ad02.tar.bz2
diff: refactor COLOR_DIFF from a flag into an int
This lets us store more than just a bit flag for whether we want color; we can also store whether we want automatic colors. This can be useful for making the automatic-color decision closer to the point of use. This mostly just involves replacing DIFF_OPT_* calls with manipulations of the flag. The biggest exception is that calls to DIFF_OPT_TST must check for "o->use_color > 0", which lets an "unknown" value (i.e., the default) stay at "no color". In the previous code, a value of "-1" was not propagated at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index 9f4e0ba..da4bce5 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -681,7 +681,7 @@ static void wt_status_print_verbose(struct wt_status *s)
* will have checked isatty on stdout).
*/
if (s->fp != stdout)
- DIFF_OPT_CLR(&rev.diffopt, COLOR_DIFF);
+ rev.diffopt.use_color = 0;
run_diff_index(&rev, 1);
}