diff options
| author | Jeff King <peff@peff.net> | 2008-01-17 16:03:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-18 10:29:38 +0100 |
| commit | 472ca780773ac75fa6af881117ce5360957fae2d (patch) | |
| tree | b97650f1d644df66457763b00617b9a6eccc46d5 /diff.c | |
| parent | autoconf: Add checking for unsetenv function (diff) | |
| download | git-472ca780773ac75fa6af881117ce5360957fae2d.tar.xz git-472ca780773ac75fa6af881117ce5360957fae2d.zip | |
color unchanged lines as "plain" in "diff --color-words"
These were mistakenly being colored in "meta" color.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | diff.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -552,7 +552,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) int i; int color; struct emit_callback *ecbdata = priv; - const char *set = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); + const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO); + const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); *(ecbdata->found_changesp) = 1; @@ -564,9 +565,9 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : ""; printf("%s--- %s%s%s\n", - set, ecbdata->label_path[0], reset, name_a_tab); + meta, ecbdata->label_path[0], reset, name_a_tab); printf("%s+++ %s%s%s\n", - set, ecbdata->label_path[1], reset, name_b_tab); + meta, ecbdata->label_path[1], reset, name_b_tab); ecbdata->label_path[0] = ecbdata->label_path[1] = NULL; } @@ -586,7 +587,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) } if (len < ecbdata->nparents) { - set = reset; emit_line(reset, reset, line, len); return; } @@ -610,7 +610,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) diff_words_show(ecbdata->diff_words); line++; len--; - emit_line(set, reset, line, len); + emit_line(plain, reset, line, len); return; } for (i = 0; i < ecbdata->nparents && len; i++) { |