global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-23 23:20:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/diff-populate-filespec-size-only-fix'

Browse Source 
"git diff --quiet" relies on the size field in diff_filespec to be
correctly populated, but diff_populate_filespec() helper function
made an incorrect short-cut when asked only to populate the size
field for paths that need to go through convert_to_git() (e.g. CRLF
conversion).

* jc/diff-populate-filespec-size-only-fix:
  diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()
This commit is contained in:
Junio C Hamano
2017-03-12 23:21:36 -07:00
parent 6c621015f2 12426e114b
commit 60f335b87f
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t4035-diff-quiet.sh
View File

@@ -152,4 +152,13 @@ test_expect_success 'git diff --quiet ignores stat-change only entries' '
test_expect_code 1 git diff --quiet
'
test_expect_success 'git diff --quiet on a path that need conversion' '
echo "crlf.txt text=auto" >.gitattributes &&
printf "Hello\r\nWorld\r\n" >crlf.txt &&
git add .gitattributes crlf.txt &&
printf "Hello\r\nWorld\n" >crlf.txt &&
git diff --quiet crlf.txt
'
test_done