projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c62101 12426e1)
Merge branch 'jc/diff-populate-filespec-size-only-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:21:36 +0000 (23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Mar 2017 06:21:36 +0000 (23:21 -0700)
commit60f335b87f005c5f6c2eee1787eed9037b90c053
tree05a41a0772006def96b8f0734c20afd0f2411116tree | snapshot
parent6c621015f2b5028b8743da0b13293cc99fb2be6bcommit | diff
parent12426e114b252d130d83c3f098c4ceae3cf217e3commit | diff
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()
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.