From: Philip Oakley <philipoakley@iee.email>
Date: Wed, 1 Dec 2021 00:29:02 +0000 (+0000)
Subject: object-file.c: LLP64 compatibility, upcast unity for left shift
X-Git-Tag: v2.35.0-rc0~107^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26de1fc0c99026f341b8011957562991e4ea6c51;p=thirdparty%2Fgit.git

object-file.c: LLP64 compatibility, upcast unity for left shift

Visual Studio reports C4334 "was 64-bit shift intended" warning because
of size miss-match.

Promote unity to the matching type to fit with the assignment.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/object-file.c b/object-file.c
index c3d866a287..da8821cb91 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 ||