diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:10 -0800 |
| commit | cb136bd8521b6be057c08ab4cc92085030407d72 (patch) | |
| tree | a3b75e78f5b6693badcec8575c511609b077c313 /object-file.c | |
| parent | Merge branch 'rs/mergesort' (diff) | |
| parent | object-file.c: LLP64 compatibility, upcast unity for left shift (diff) | |
| download | tgif-cb136bd8521b6be057c08ab4cc92085030407d72.tar.xz | |
Merge branch 'po/size-t-for-vs'
On platforms where ulong is shorter than size_t, code paths that
shifted 1 or 1U to the left lacked the necessary cast to size_t,
which have been corrected.
* po/size-t-for-vs:
object-file.c: LLP64 compatibility, upcast unity for left shift
diffcore-delta.c: LLP64 compatibility, upcast unity for left shift
repack.c: LLP64 compatibility, upcast unity for left shift
Diffstat (limited to 'object-file.c')
| -rw-r--r-- | object-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/object-file.c b/object-file.c index eb972cdccd..eac67f6f5f 100644 --- a/object-file.c +++ b/object-file.c @@ -2425,7 +2425,7 @@ struct oidtree *odb_loose_cache(struct object_directory *odb, struct strbuf buf = STRBUF_INIT; size_t word_bits = bitsizeof(odb->loose_objects_subdir_seen[0]); size_t word_index = subdir_nr / word_bits; - size_t mask = 1u << (subdir_nr % word_bits); + size_t mask = (size_t)1u << (subdir_nr % word_bits); uint32_t *bitmap; if (subdir_nr < 0 || |