X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=wt-status.c;h=70fdb76ff2b5100c6d20f9f3b758e1ac8df314e1;hb=c32c95916549331a581fadfa749c4322c14ccd78;hp=c01838c5ad5d04996478350c01a9c49231a467bc;hpb=a574c04fbfa06d9b40c4c32db27135c503da7c15;p=git.git

diff --git a/wt-status.c b/wt-status.c
index c01838c5a..70fdb76ff 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -26,7 +26,9 @@ static char default_wt_status_colors[][COLOR_MAXLEN] = {
 
 static const char *color(int slot, struct wt_status *s)
 {
-	const char *c = s->use_color > 0 ? s->color_palette[slot] : "";
+	const char *c = "";
+	if (want_color(s->use_color))
+		c = s->color_palette[slot];
 	if (slot == WT_STATUS_ONBRANCH && color_is_nil(c))
 		c = s->color_palette[WT_STATUS_HEADER];
 	return c;
@@ -681,7 +683,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);
 }