Fix '\ No newline...' annotation in rewrite diffs
When a file that ends with an incomplete line is expressed as a complete rewrite with the -B option, git diff incorrectly appends the incomplete line indicator "\ No newline at end of file" after such a line, rather than writing it on a line of its own (the output codepath for normal output without -B does not have this problem). Add a LF after the incomplete line before writing the "\ No newline ..." out to fix this. Add a couple of tests to confirm that the indicator comment is generated on its own line in both plain diff and rewrite mode. Signed-off-by: Adam Butcher <dev.lists@jessamine.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adam Butcher committed
Aug 4, 2012 at 21:07 UTC
35e2d03c2c24462717d774cd9f4eea46f1474ba1
2 files changed
+31
diff.c
+1
@@ -574,6 +574,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
574
if (!endp) {
575
const char *plain = diff_get_color(ecb->color_diff,
576
DIFF_PLAIN);
577
+ putc('\n', ecb->opt->file);
578
emit_line_0(ecb->opt, plain, reset, '\\',
579
nneof, strlen(nneof));
580
}
t/t4022-diff-rewrite.sh
+30
@@ -66,5 +66,35 @@ test_expect_success 'suppress deletion diff with -B -D' '
66
grep -v "Linus Torvalds" actual
67
'
68
69
+test_expect_success 'prepare a file that ends with an incomplete line' '
70
+ test_seq 1 99 >seq &&
71
+ printf 100 >>seq &&
72
+ git add seq &&
73
+ git commit seq -m seq
74
+'
75
+
76
+test_expect_success 'rewrite the middle 90% of sequence file and terminate with newline' '
77
+ test_seq 1 5 >seq &&
78
+ test_seq 9331 9420 >>seq &&
79
+ test_seq 96 100 >>seq
80
+'
81
+
82
+test_expect_success 'confirm that sequence file is considered a rewrite' '
83
+ git diff -B seq >res &&
84
+ grep "dissimilarity index" res
85
+'
86
+
87
+test_expect_success 'no newline at eof is on its own line without -B' '
88
+ git diff seq >res &&
89
+ grep "^\\\\ " res &&
90
+ ! grep "^..*\\\\ " res
91
+'
92
+
93
+test_expect_success 'no newline at eof is on its own line with -B' '
94
+ git diff -B seq >res &&
95
+ grep "^\\\\ " res &&
96
+ ! grep "^..*\\\\ " res
97
+'
98
+
99
test_done
100