diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-04 22:49:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-04 22:49:06 +0300 |
| commit | 86cca370e1989e0cbcd412f8770883a20d86eee8 (patch) | |
| tree | 9fa4a26d69b3d30986b470b2482afb37a63080d0 /builtin/fast-export.c | |
| parent | 94de88c986712e79c20813ba54e797c4ca83137b (diff) | |
| parent | 176380fd113a97b09c99a5f7273725527823fa1b (diff) | |
Merge branch 'jk/drop-unaligned-loads'
Compilation fix around type punning.
* jk/drop-unaligned-loads:
Revert "fast-export: use local array to store anonymized oid"
bswap.h: drop unaligned loads
Diffstat (limited to 'builtin/fast-export.c')
| -rw-r--r-- | builtin/fast-export.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 1b8fca3ee0..e266d90a81 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -405,12 +405,12 @@ static char *generate_fake_oid(void *data) { static uint32_t counter = 1; /* avoid null oid */ const unsigned hashsz = the_hash_algo->rawsz; - unsigned char out[GIT_MAX_RAWSZ]; + struct object_id oid; char *hex = xmallocz(GIT_MAX_HEXSZ); - hashclr(out); - put_be32(out + hashsz - 4, counter++); - return hash_to_hex_algop_r(hex, out, the_hash_algo); + oidclr(&oid); + put_be32(oid.hash + hashsz - 4, counter++); + return oid_to_hex_r(hex, &oid); } static const char *anonymize_oid(const char *oid_hex) |