Merge branch 'fix'
* fix: Fix git-pack-objects for 64-bit platforms
This commit is contained in:
commit
3a3e89b897
@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
|
||||
|
||||
rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
|
||||
for (i = 0; i < num_ent; i++) {
|
||||
long hl = *((long *)(index + 24 * i));
|
||||
uint32_t hl = *((uint32_t *)(index + 24 * i));
|
||||
rix->revindex[i] = ntohl(hl);
|
||||
}
|
||||
/* This knows the pack format -- the 20-byte trailer
|
||||
|
@ -1161,7 +1161,7 @@ int find_pack_entry_one(const unsigned char *sha1,
|
||||
int mi = (lo + hi) / 2;
|
||||
int cmp = memcmp(index + 24 * mi + 4, sha1, 20);
|
||||
if (!cmp) {
|
||||
e->offset = ntohl(*((int*)(index + 24 * mi)));
|
||||
e->offset = ntohl(*((uint32_t *)(index + 24 * mi)));
|
||||
memcpy(e->sha1, sha1, 20);
|
||||
e->p = p;
|
||||
return 1;
|
||||
|
Loading…
Reference in New Issue
Block a user