diff options
| author | Adam Butcher <dev.lists@jessamine.co.uk> | 2012-08-04 21:07:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-05 19:37:52 (GMT) |
| commit | 35e2d03c2c24462717d774cd9f4eea46f1474ba1 (patch) | |
| tree | 79ff7fb51679d202ccbf17dbee8f833db0afd3b4 /t/t4022-diff-rewrite.sh | |
| parent | d17cf5f3a32f07bf8a6b8fb014abfa8e87fd7075 (diff) | |
| download | git-35e2d03c2c24462717d774cd9f4eea46f1474ba1.zip git-35e2d03c2c24462717d774cd9f4eea46f1474ba1.tar.gz git-35e2d03c2c24462717d774cd9f4eea46f1474ba1.tar.bz2 | |
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>
Diffstat (limited to 't/t4022-diff-rewrite.sh')
| -rwxr-xr-x | t/t4022-diff-rewrite.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh index c00a94b..2d030a4 100755 --- a/t/t4022-diff-rewrite.sh +++ b/t/t4022-diff-rewrite.sh @@ -66,5 +66,35 @@ test_expect_success 'suppress deletion diff with -B -D' ' grep -v "Linus Torvalds" actual ' +test_expect_success 'prepare a file that ends with an incomplete line' ' + test_seq 1 99 >seq && + printf 100 >>seq && + git add seq && + git commit seq -m seq +' + +test_expect_success 'rewrite the middle 90% of sequence file and terminate with newline' ' + test_seq 1 5 >seq && + test_seq 9331 9420 >>seq && + test_seq 96 100 >>seq +' + +test_expect_success 'confirm that sequence file is considered a rewrite' ' + git diff -B seq >res && + grep "dissimilarity index" res +' + +test_expect_success 'no newline at eof is on its own line without -B' ' + git diff seq >res && + grep "^\\\\ " res && + ! grep "^..*\\\\ " res +' + +test_expect_success 'no newline at eof is on its own line with -B' ' + git diff -B seq >res && + grep "^\\\\ " res && + ! grep "^..*\\\\ " res +' + test_done |