diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-13 14:10:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-13 14:11:43 -0700 |
| commit | 8d48ad62a902556b523ee892a3fbe4206d576d3f (patch) | |
| tree | 7ac4f3014ebba31845797f62fc39dac5cd246dd1 /pack-objects.c | |
| parent | 639ca5497279607665847f2e3a11064441a8f2a6 (diff) | |
| parent | d14f776402d9f7040cc71ff6e3b992b2e019526a (diff) | |
| download | git-8d48ad62a902556b523ee892a3fbe4206d576d3f.tar.xz | |
Merge branch 'lt/fix-config' into lt/config
* lt/fix-config:
git config syntax updates
Another config file parsing fix.
checkout: use --aggressive when running a 3-way merge (-m).
Fix git-pack-objects for 64-bit platforms
with manual adjustment of t/t1300 for "git repo-config --list" option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-objects.c b/pack-objects.c index 523a1c7da8..1b9e7a1cb9 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -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 |