Hi, On Mon, 30 Mar 2009, Allan Caffee wrote: > +static void strbuf_write_column(struct strbuf *sb, const struct column *c, > + const char *s) > +{ > + /* > + * TODO: I get the creeping suspicion that this isn't the > + * right flag to be checking since --no-color doesn't turn > + * this off. > + */ Heh, of course I forgot to remove this with my to-be-squashed-in patch... > + if (diff_use_color_default) > + strbuf_addstr(sb, c->color); > + strbuf_addstr(sb, s); > + if (diff_use_color_default) > + strbuf_addstr(sb, GIT_COLOR_RESET); > +} How about this function instead? static void strbuf_add_column(struct strbuf *sb, const struct column *column, const char *fmt, ...) { va_list ap; va_start(ap, fmt); if (column->color) strbuf_addstr(sb, column->color); strbuf_vaddf(sb, fmt, ap); if (column->color) strbuf_addstr(sb, GIT_COLOR_RESET); va_end(ap); } Hmm? Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html