diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 04:05:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 04:05:44 +0400 |
| commit | 59d94bc9c851f9f4086a857bc6277feca6a48824 (patch) | |
| tree | be6f6f7b2bca2e9b1348cdb8685e87599cf45335 /csum-file.c | |
| parent | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (diff) | |
| parent | d35825da6d5570524234e1bfe4ff0f57957b6db3 (diff) | |
Merge branch 'np/maint-safer-pack' into np/pack
* np/maint-safer-pack:
fixup_pack_header_footer(): use nicely aligned buffer sizes
index-pack: use fixup_pack_header_footer()'s validation mode
pack-objects: use fixup_pack_header_footer()'s validation mode
improve reliability of fixup_pack_header_footer()
pack-objects: improve returned information from write_one()
Diffstat (limited to 'csum-file.c')
| -rw-r--r-- | csum-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/csum-file.c b/csum-file.c index ace64f165e..28389541a3 100644 --- a/csum-file.c +++ b/csum-file.c @@ -42,11 +42,11 @@ int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags) sha1flush(f, offset); f->offset = 0; } + SHA1_Final(f->buffer, &f->ctx); + if (result) + hashcpy(result, f->buffer); if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { /* write checksum and close fd */ - SHA1_Final(f->buffer, &f->ctx); - if (result) - hashcpy(result, f->buffer); sha1flush(f, 20); if (flags & CSUM_FSYNC) fsync_or_die(f->fd, f->name); |