diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:26 -0700 |
| commit | cc8e385a7cb1bbf6d5a66ee7a0610608a122b3c0 (patch) | |
| tree | 1f362492e67ada131958790ff0ecc9acd9af15c9 /commit.c | |
| parent | 36238fc4a59ae03e5574510dec3751745f98e940 (diff) | |
| parent | 12426e114b252d130d83c3f098c4ceae3cf217e3 (diff) | |
| download | git-cc8e385a7cb1bbf6d5a66ee7a0610608a122b3c0.tar.gz | |
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()
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions