diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:08:30 -0700 |
| commit | d9b983fc268bd749c947bcf88b977dc24782353b (patch) | |
| tree | ed226b9150f4e365749352cb092858e5d86061c0 /t | |
| parent | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11 (diff) | |
| parent | Fix '\ No newline...' annotation in rewrite diffs (diff) | |
| download | tgif-d9b983fc268bd749c947bcf88b977dc24782353b.tar.xz | |
Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11
* ab/diff-write-incomplete-line:
Fix '\ No newline...' annotation in rewrite diffs
Diffstat (limited to 't')
| -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 c00a94b9ba..2d030a4ec3 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 |