Skip to content

Commit 5da2991

Browse files
dschodscho
committed
Merge pull request #3533 from PhilipOakley/hashliteral_t
Begin `unsigned long`->`size_t` conversion to support large files on Windows
2 parents 76e1342 + a6eb082 commit 5da2991

File tree

5 files changed

+59
-21
lines changed

5 files changed

+59
-21
lines changed

‎object-file.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,9 +1935,9 @@ void *read_object_with_reference(struct repository *r,
19351935
}
19361936

19371937
static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
1938-
const void *buf, unsigned long len,
1938+
const void *buf, size_t len,
19391939
struct object_id *oid,
1940-
char *hdr, int *hdrlen)
1940+
char *hdr, size_t *hdrlen)
19411941
{
19421942
algo->init_fn(c);
19431943
algo->update_fn(c, hdr, *hdrlen);
@@ -1946,23 +1946,23 @@ static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
19461946
}
19471947

19481948
static void write_object_file_prepare(const struct git_hash_algo *algo,
1949-
const void *buf, unsigned long len,
1949+
const void *buf, size_t len,
19501950
enum object_type type, struct object_id *oid,
1951-
char *hdr, int *hdrlen)
1951+
char *hdr, size_t *hdrlen)
19521952
{
19531953
git_hash_ctx c;
19541954

19551955
/* Generate the header */
19561956
*hdrlen = format_object_header(hdr, *hdrlen, type, len);
19571957

1958-
/* Sha1.. */
1958+
/* Hash (function pointers) computation */
19591959
hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
19601960
}
19611961

19621962
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1963-
const void *buf, unsigned long len,
1963+
const void *buf, size_t len,
19641964
const char *type, struct object_id *oid,
1965-
char *hdr, int *hdrlen)
1965+
char *hdr, size_t *hdrlen)
19661966
{
19671967
git_hash_ctx c;
19681968

@@ -2082,17 +2082,17 @@ int finalize_object_file_flags(const char *tmpfile, const char *filename,
20822082
}
20832083

20842084
static void hash_object_file_literally(const struct git_hash_algo *algo,
2085-
const void *buf, unsigned long len,
2085+
const void *buf, size_t len,
20862086
const char *type, struct object_id *oid)
20872087
{
20882088
char hdr[MAX_HEADER_LEN];
2089-
int hdrlen = sizeof(hdr);
2089+
size_t hdrlen = sizeof(hdr);
20902090

20912091
write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
20922092
}
20932093

20942094
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
2095-
unsigned long len, enum object_type type,
2095+
size_t len, enum object_type type,
20962096
struct object_id *oid)
20972097
{
20982098
hash_object_file_literally(algo, buf, len, type_name(type), oid);
@@ -2458,7 +2458,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
24582458
return err;
24592459
}
24602460

2461-
int write_object_file_flags(const void *buf, unsigned long len,
2461+
int write_object_file_flags(const void *buf, size_t len,
24622462
enum object_type type, struct object_id *oid,
24632463
struct object_id *compat_oid_in, unsigned flags)
24642464
{
@@ -2467,7 +2467,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
24672467
const struct git_hash_algo *compat = repo->compat_hash_algo;
24682468
struct object_id compat_oid;
24692469
char hdr[MAX_HEADER_LEN];
2470-
int hdrlen = sizeof(hdr);
2470+
size_t hdrlen = sizeof(hdr);
24712471

24722472
/* Generate compat_oid */
24732473
if (compat) {
@@ -2498,7 +2498,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
24982498
return 0;
24992499
}
25002500

2501-
int write_object_file_literally(const void *buf, unsigned long len,
2501+
int write_object_file_literally(const void *buf, size_t len,
25022502
const char *type, struct object_id *oid,
25032503
unsigned flags)
25042504
{
@@ -2507,8 +2507,8 @@ int write_object_file_literally(const void *buf, unsigned long len,
25072507
const struct git_hash_algo *algo = repo->hash_algo;
25082508
const struct git_hash_algo *compat = repo->compat_hash_algo;
25092509
struct object_id compat_oid;
2510-
int hdrlen, status = 0;
2511-
int compat_type = -1;
2510+
size_t hdrlen;
2511+
int status = 0, compat_type = -1;
25122512

25132513
if (compat) {
25142514
compat_type = type_from_string_gently(type, -1, 1);

‎object-store-ll.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ void *repo_read_object_file(struct repository *r,
270270
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
271271

272272
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
273-
unsigned long len, enum object_type type,
273+
size_t len, enum object_type type,
274274
struct object_id *oid);
275275

276-
int write_object_file_flags(const void *buf, unsigned long len,
276+
int write_object_file_flags(const void *buf, size_t len,
277277
enum object_type type, struct object_id *oid,
278278
struct object_id *comapt_oid_in, unsigned flags);
279279
static inline int write_object_file(const void *buf, unsigned long len,
@@ -282,7 +282,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
282282
return write_object_file_flags(buf, len, type, oid, NULL, 0);
283283
}
284284

285-
int write_object_file_literally(const void *buf, unsigned long len,
285+
int write_object_file_literally(const void *buf, size_t len,
286286
const char *type, struct object_id *oid,
287287
unsigned flags);
288288
int stream_loose_object(struct input_stream *in_stream, size_t len,

‎sha1dc_git.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
2727
/*
2828
* Same as SHA1DCUpdate, but adjust types to match git's usual interface.
2929
*/
30-
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len)
30+
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, size_t len)
3131
{
3232
const char *data = vdata;
33-
/* We expect an unsigned long, but sha1dc only takes an int */
3433
while (len > INT_MAX) {
3534
SHA1DCUpdate(ctx, data, INT_MAX);
3635
data += INT_MAX;

‎sha1dc_git.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void git_SHA1DCInit(SHA1_CTX *);
1515
#endif
1616

1717
void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);
18-
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len);
18+
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, size_t len);
1919

2020
#define platform_SHA_IS_SHA1DC /* used by "test-tool sha1-is-sha1dc" */
2121

‎t/t1007-hash-object.sh‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ test_expect_success 'setup' '
4949
5050
example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
5151
example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
52+
53+
large5GB sha1:0be2be10a4c8764f32c4bf372a98edc731a4b204
54+
large5GB sha256:dc18ca621300c8d3cfa505a275641ebab00de189859e022a975056882d313e64
5255
EOF
5356
'
5457

@@ -265,4 +268,40 @@ test_expect_success '--stdin outside of repository (uses SHA-1)' '
265268
test_cmp expect actual
266269
'
267270

271+
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
272+
'files over 4GB hash literally' '
273+
test-tool genzeros $((5*1024*1024*1024)) >big &&
274+
test_oid large5GB >expect &&
275+
git hash-object --stdin --literally <big >actual &&
276+
test_cmp expect actual
277+
'
278+
279+
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
280+
'files over 4GB hash correctly via --stdin' '
281+
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
282+
test_oid large5GB >expect &&
283+
git hash-object --stdin <big >actual &&
284+
test_cmp expect actual
285+
'
286+
287+
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
288+
'files over 4GB hash correctly' '
289+
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
290+
test_oid large5GB >expect &&
291+
git hash-object -- big >actual &&
292+
test_cmp expect actual
293+
'
294+
295+
# This clean filter does nothing, other than excercising the interface.
296+
# We ensure that cleaning doesn't mangle large files on 64-bit Windows.
297+
test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
298+
'hash filtered files over 4GB correctly' '
299+
{ test -f big || test-tool genzeros $((5*1024*1024*1024)) >big; } &&
300+
test_oid large5GB >expect &&
301+
test_config filter.null-filter.clean "cat" &&
302+
echo "big filter=null-filter" >.gitattributes &&
303+
git hash-object -- big >actual &&
304+
test_cmp expect actual
305+
'
306+
268307
test_done

0 commit comments

Comments
 (0)