mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/diff-write-incomplete-line'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-08-27 11:54:46 -07:00
parent e3fe71433f 35e2d03c2c
commit e6daf0ac22
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
t/t4022-diff-rewrite.sh
View File

@ -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