summaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-10-16 00:40:58 +0200
committerJunio C Hamano <gitster@pobox.com>2014-10-16 19:10:41 +0200
commitcac05d4dfd148071462939a61ecd44cf932a0b02 (patch)
tree278f7256254da08af94c6339803771c749abb278 /merge.c
parentprune-packed: use for_each_loose_file_in_objdir (diff)
downloadgit-cac05d4dfd148071462939a61ecd44cf932a0b02.tar.xz
git-cac05d4dfd148071462939a61ecd44cf932a0b02.zip
count-objects: do not use xsize_t when counting object size
The point of xsize_t is to safely cast an off_t into a size_t (because we are about to mmap). But in count-objects, we are summing the sizes in an off_t. Using xsize_t means that count-objects could fail on a 32-bit system with a 4G object (not likely, as other parts of git would fail, but we should at least be correct here). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions