kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  diff.c: fix emit_line() again not to add extra line
maint
Junio C Hamano 2008-06-16 17:39:50 -07:00
parent 9dc784a970 4afbcab989
commit 5f54de5bd0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -514,13 +514,15 @@ 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') int has_trailing_newline = (len > 0 && line[len-1] == '\n');
if (has_trailing_newline)
len--; 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); if (has_trailing_newline)
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)