From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:03:26 +0000 (-0700)
Subject: Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint
X-Git-Tag: v2.12.2~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cc8e385a7cb1bbf6d5a66ee7a0610608a122b3c0

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

"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()
---

cc8e385a7cb1bbf6d5a66ee7a0610608a122b3c0