diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:12:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:12:47 -0700 |
| commit | 9f35e5fd544ab87488b12d9b97be983303e58bd2 (patch) | |
| tree | f6ca65df4786bcb9bf615684455139feeb5e8c7f /csum-file.c | |
| parent | Update draft release notes for 1.6.0.2 (diff) | |
| parent | fixup_pack_header_footer(): use nicely aligned buffer sizes (diff) | |
| download | tgif-9f35e5fd544ab87488b12d9b97be983303e58bd2.tar.xz | |
Merge branch 'np/maint-safer-pack' into maint
* 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); |