From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Mar 2017 06:21:36 +0000 (-0700)
Subject: Merge branch 'jc/diff-populate-filespec-size-only-fix'
X-Git-Tag: v2.13.0-rc0~125
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60f335b87f005c5f6c2eee1787eed9037b90c053

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

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

60f335b87f005c5f6c2eee1787eed9037b90c053