diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-16 16:14:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-16 16:14:22 -0700 |
| commit | 9dc784a970ba5cc3871f7244c6bf6a823754f0a0 (patch) | |
| tree | ecff10a922f352693b7411574b41898dfe16ae17 /diff.c | |
| parent | Make git reflog expire honour core.sharedRepository. (diff) | |
| parent | diff: reset color before printing newline (diff) | |
| download | tgif-9dc784a970ba5cc3871f7244c6bf6a823754f0a0.tar.xz | |
Merge branch 'maint'
* maint:
diff: reset color before printing newline
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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) { + if (len > 0 && line[len-1] == '\n') + len--; + fputs(set, file); fwrite(line, len, 1, file); fputs(reset, file); + fputc('\n', file); } static void emit_add_line(const char *reset, struct emit_callback *ecbdata, const char *line, int len) |