Skip to content

Commit b05940b

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 63898eb + b6d1f32 commit b05940b

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
@@ -1897,9 +1897,9 @@ void *read_object_with_reference(struct repository *r,
18971897
}
18981898

18991899
static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
1900-
const void *buf, unsigned long len,
1900+
const void *buf, size_t len,
19011901
struct object_id *oid,
1902-
char *hdr, int *hdrlen)
1902+
char *hdr, size_t *hdrlen)
19031903
{
19041904
algo->init_fn(c);
19051905
algo->update_fn(c, hdr, *hdrlen);
@@ -1908,23 +1908,23 @@ static void hash_object_body(const struct git_hash_algo *algo, git_hash_ctx *c,
19081908
}
19091909

19101910
static void write_object_file_prepare(const struct git_hash_algo *algo,
1911-
const void *buf, unsigned long len,
1911+
const void *buf, size_t len,
19121912
enum object_type type, struct object_id *oid,
1913-
char *hdr, int *hdrlen)
1913+
char *hdr, size_t *hdrlen)
19141914
{
19151915
git_hash_ctx c;
19161916

19171917
/* Generate the header */
19181918
*hdrlen = format_object_header(hdr, *hdrlen, type, len);
19191919

1920-
/* Sha1.. */
1920+
/* Hash (function pointers) computation */
19211921
hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
19221922
}
19231923

19241924
static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
1925-
const void *buf, unsigned long len,
1925+
const void *buf, size_t len,
19261926
const char *type, struct object_id *oid,
1927-
char *hdr, int *hdrlen)
1927+
char *hdr, size_t *hdrlen)
19281928
{
19291929
git_hash_ctx c;
19301930

@@ -1976,17 +1976,17 @@ int finalize_object_file(const char *tmpfile, const char *filename)
19761976
}
19771977

19781978
static void hash_object_file_literally(const struct git_hash_algo *algo,
1979-
const void *buf, unsigned long len,
1979+
const void *buf, size_t len,
19801980
const char *type, struct object_id *oid)
19811981
{
19821982
char hdr[MAX_HEADER_LEN];
1983-
int hdrlen = sizeof(hdr);
1983+
size_t hdrlen = sizeof(hdr);
19841984

19851985
write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
19861986
}
19871987

19881988
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
1989-
unsigned long len, enum object_type type,
1989+
size_t len, enum object_type type,
19901990
struct object_id *oid)
19911991
{
19921992
hash_object_file_literally(algo, buf, len, type_name(type), oid);
@@ -2350,7 +2350,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
23502350
return err;
23512351
}
23522352

2353-
int write_object_file_flags(const void *buf, unsigned long len,
2353+
int write_object_file_flags(const void *buf, size_t len,
23542354
enum object_type type, struct object_id *oid,
23552355
struct object_id *compat_oid_in, unsigned flags)
23562356
{
@@ -2359,7 +2359,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
23592359
const struct git_hash_algo *compat = repo->compat_hash_algo;
23602360
struct object_id compat_oid;
23612361
char hdr[MAX_HEADER_LEN];
2362-
int hdrlen = sizeof(hdr);
2362+
size_t hdrlen = sizeof(hdr);
23632363

23642364
/* Generate compat_oid */
23652365
if (compat) {
@@ -2390,7 +2390,7 @@ int write_object_file_flags(const void *buf, unsigned long len,
23902390
return 0;
23912391
}
23922392

2393-
int write_object_file_literally(const void *buf, unsigned long len,
2393+
int write_object_file_literally(const void *buf, size_t len,
23942394
const char *type, struct object_id *oid,
23952395
unsigned flags)
23962396
{
@@ -2399,8 +2399,8 @@ int write_object_file_literally(const void *buf, unsigned long len,
23992399
const struct git_hash_algo *algo = repo->hash_algo;
24002400
const struct git_hash_algo *compat = repo->compat_hash_algo;
24012401
struct object_id compat_oid;
2402-
int hdrlen, status = 0;
2403-
int compat_type = -1;
2402+
size_t hdrlen;
2403+
int status = 0, compat_type = -1;
24042404

24052405
if (compat) {
24062406
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
@@ -265,10 +265,10 @@ void *repo_read_object_file(struct repository *r,
265265
int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
266266

267267
void hash_object_file(const struct git_hash_algo *algo, const void *buf,
268-
unsigned long len, enum object_type type,
268+
size_t len, enum object_type type,
269269
struct object_id *oid);
270270

271-
int write_object_file_flags(const void *buf, unsigned long len,
271+
int write_object_file_flags(const void *buf, size_t len,
272272
enum object_type type, struct object_id *oid,
273273
struct object_id *comapt_oid_in, unsigned flags);
274274
static inline int write_object_file(const void *buf, unsigned long len,
@@ -277,7 +277,7 @@ static inline int write_object_file(const void *buf, unsigned long len,
277277
return write_object_file_flags(buf, len, type, oid, NULL, 0);
278278
}
279279

280-
int write_object_file_literally(const void *buf, unsigned long len,
280+
int write_object_file_literally(const void *buf, size_t len,
281281
const char *type, struct object_id *oid,
282282
unsigned flags);
283283
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
#define platform_SHA_CTX SHA1_CTX

‎t/t1007-hash-object.sh

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

@@ -266,4 +269,40 @@ test_expect_success '--stdin outside of repository (uses SHA-1)' '
266269
test_cmp expect actual
267270
'
268271

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

0 commit comments

Comments
 (0)