Merge branch 'maint'

gitster · gitster · commit 9dc784a970ba · 2008-06-16T16:14:22.000-07:00
* maint:
  diff: reset color before printing newline
diff --git a/diff.c b/diff.c
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -514,9 +514,13 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix)`
`514`	`514`
`515`	`515`	`static void emit_line(FILE file, const char set, const char reset, const char line, int len)`
`516`	`516`	`{`
	`517`	`+ if (len > 0 && line[len-1] == '\n')`
	`518`	`+ len--;`
	`519`	`+`
`517`	`520`	`fputs(set, file);`
`518`	`521`	`fwrite(line, len, 1, file);`
`519`	`522`	`fputs(reset, file);`
	`523`	`+ fputc('\n', file);`
`520`	`524`	`}`
`521`	`525`
`522`	`526`	`static void emit_add_line(const char reset, struct emit_callback ecbdata, const char *line, int len)`