From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jun 2008 00:39:50 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5f54de5bd07481f6d88e8dbd5551f3356ecbf513?hp=9dc784a970ba5cc3871f7244c6bf6a823754f0a0

Merge branch 'maint'

* maint:
diff.c: fix emit_line() again not to add extra line
---

diff --git a/diff.c b/diff.c
index f23657bd34..5262490086 100644
--- a/diff.c
+++ b/diff.c
@@ -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)
 {
-	if (len > 0 && line[len-1] == '\n')
+	int has_trailing_newline = (len > 0 && line[len-1] == '\n');
+	if (has_trailing_newline)
 		len--;
 
 	fputs(set, file);
 	fwrite(line, len, 1, 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)