summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 11:54:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-27 11:54:46 -0700
commite6daf0ac2209eb5c69f28c008715ad1a3b79c057 (patch)
treec5676e1843d8230127057ddec97c2318ae2baf6e /diff.c
parente3fe71433f22839a4bd748e55c90421a8eaffcc5 (diff)
parent35e2d03c2c24462717d774cd9f4eea46f1474ba1 (diff)
downloadgit-e6daf0ac2209eb5c69f28c008715ad1a3b79c057.tar.gz
Merge branch 'ab/diff-write-incomplete-line'
The output from "git diff -B" for a file that ends with an incomplete line did not put "\ No newline..." on a line of its own. * ab/diff-write-incomplete-line: Fix '\ No newline...' annotation in rewrite diffs
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index bd37d9b2c8..e6846ca750 100644
--- a/diff.c
+++ b/diff.c
@@ -574,6 +574,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
if (!endp) {
const char *plain = diff_get_color(ecb->color_diff,
DIFF_PLAIN);
+ putc('\n', ecb->opt->file);
emit_line_0(ecb->opt, plain, reset, '\\',
nneof, strlen(nneof));
}