diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-29 17:09:58 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 17:10:05 +0900 |
| commit | 7913f53b5628997165e075008d6142da1c04271a (patch) | |
| tree | ec9ffa97b492e873118bc9e3d521b9cab63b7098 /sha1-file.c | |
| parent | e144d126d74f5d2702870ca9423743102eec6fcd (diff) | |
| parent | fc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff) | |
| download | git-7913f53b5628997165e075008d6142da1c04271a.tar.gz | |
Sync with Git 2.17.1
* maint: (25 commits)
Git 2.17.1
Git 2.16.4
Git 2.15.2
Git 2.14.4
Git 2.13.7
fsck: complain when .gitmodules is a symlink
index-pack: check .gitmodules files with --strict
unpack-objects: call fsck_finish() after fscking objects
fsck: call fsck_finish() after fscking objects
fsck: check .gitmodules content
fsck: handle promisor objects in .gitmodules check
fsck: detect gitmodules files
fsck: actually fsck blob data
fsck: simplify ".git" check
index-pack: make fsck error message more specific
verify_path: disallow symlinks in .gitmodules
update-index: stat updated files earlier
verify_dotfile: mention case-insensitivity in comment
verify_path: drop clever fallthrough
skip_prefix: add case-insensitive variant
...
Diffstat (limited to 'sha1-file.c')
| -rw-r--r-- | sha1-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-file.c b/sha1-file.c index f66059ed7d..e47098eff2 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -2232,7 +2232,7 @@ int read_loose_object(const char *path, goto out; } - if (*type == OBJ_BLOB) { + if (*type == OBJ_BLOB && *size > big_file_threshold) { if (check_stream_sha1(&stream, hdr, *size, path, expected_oid->hash) < 0) goto out; } else { |