diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:46 -0700 |
commit | e6daf0ac2209eb5c69f28c008715ad1a3b79c057 (patch) | |
tree | c5676e1843d8230127057ddec97c2318ae2baf6e /diff.c | |
parent | e3fe71433f22839a4bd748e55c90421a8eaffcc5 (diff) | |
parent | 35e2d03c2c24462717d774cd9f4eea46f1474ba1 (diff) | |
download | git-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.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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)); } |