undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

color unchanged lines as "plain" in "diff --color-words"

Browse Source 
These were mistakenly being colored in "meta" color.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2008-01-17 10:03:06 -05:00 committed by Junio C Hamano
parent bfa8fccf47
commit 472ca78077
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diff.c
View File

@ -552,7 +552,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
int i; int i;
int color; int color;
struct emit_callback *ecbdata = priv; 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); const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
*(ecbdata->found_changesp) = 1; *(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" : ""; name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
printf("%s--- %s%s%s\n", 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", 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; 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) { if (len < ecbdata->nparents) {
set = reset;
emit_line(reset, reset, line, len); emit_line(reset, reset, line, len);
return; return;
} }
@ -610,7 +610,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
diff_words_show(ecbdata->diff_words); diff_words_show(ecbdata->diff_words);
line++; line++;
len--; len--;
emit_line(set, reset, line, len); emit_line(plain, reset, line, len);
return; return;
} }
for (i = 0; i < ecbdata->nparents && len; i++) { for (i = 0; i < ecbdata->nparents && len; i++) {