projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95cc55f 12426e1)
Merge branch 'jc/diff-populate-filespec-size-only-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:30 +0000 (13:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:30 +0000 (13:35 -0800)
commit9b2d1ca50fd72515d22f92562b9a3fa383e37ac2
treee0acb92d65cea4934f710daead098844bb320c1dtree | snapshot
parent95cc55f9a34b26f623ff83c678dee2cf13e7ac54commit | diff
parent12426e114b252d130d83c3f098c4ceae3cf217e3commit | diff
Merge branch 'jc/diff-populate-filespec-size-only-fix' into next

"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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.