diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-12 23:21:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-12 23:21:36 -0700 |
commit | 60f335b87f005c5f6c2eee1787eed9037b90c053 (patch) | |
tree | 05a41a0772006def96b8f0734c20afd0f2411116 /builtin/count-objects.c | |
parent | 6c621015f2b5028b8743da0b13293cc99fb2be6b (diff) | |
parent | 12426e114b252d130d83c3f098c4ceae3cf217e3 (diff) | |
download | git-60f335b87f005c5f6c2eee1787eed9037b90c053.tar.gz |
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()
Diffstat (limited to 'builtin/count-objects.c')
0 files changed, 0 insertions, 0 deletions