mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  diff: reset color before printing newline
This commit is contained in:
Junio C Hamano
2008-06-16 16:14:22 -07:00
parent 336d09daf2 06ff64ae3d
commit 9dc784a970
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -514,9 +514,13 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)
static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len) static void emit_line(FILE *file, const char *set, const char *reset, const char *line, int len)
{ {
if (len > 0 && line[len-1] == '\n')
len--;
fputs(set, file); fputs(set, file);
fwrite(line, len, 1, file); fwrite(line, len, 1, file);
fputs(reset, file); fputs(reset, file);
fputc('\n', file);
} }
static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len) static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len)