]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jc/diff-populate-filespec-size-only-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:26 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:26 +0000 (15:03 -0700)
commitcc8e385a7cb1bbf6d5a66ee7a0610608a122b3c0
tree1f362492e67ada131958790ff0ecc9acd9af15c9
parent36238fc4a59ae03e5574510dec3751745f98e940
parent12426e114b252d130d83c3f098c4ceae3cf217e3
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()
diff.c