summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-08-29 20:08:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-30 04:51:27 (GMT)
commitac0463ed44e859c84e354cd0ae47d9b5b124e112 (patch)
tree74ad345fc9f75b27cc6d553daf9b8825279079e6
parentabeb40e5aa5b4a39799ae1caad241c8c7708053a (diff)
downloadgit-ac0463ed44e859c84e354cd0ae47d9b5b124e112.zip
git-ac0463ed44e859c84e354cd0ae47d9b5b124e112.tar.gz
git-ac0463ed44e859c84e354cd0ae47d9b5b124e112.tar.bz2
pack-objects: use fixup_pack_header_footer()'s validation mode
When limiting the pack size, a new header has to be written to the pack and a new SHA1 computed. Make sure that the SHA1 of what is being read back matches the SHA1 of what was written. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-pack-objects.c4
-rw-r--r--csum-file.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 501f936..a02c673 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -492,9 +492,9 @@ static void write_pack_file(void)
} else if (nr_written == nr_remaining) {
sha1close(f, sha1, CSUM_FSYNC);
} else {
- int fd = sha1close(f, NULL, 0);
+ int fd = sha1close(f, sha1, 0);
fixup_pack_header_footer(fd, sha1, pack_tmp_name,
- nr_written, NULL, 0);
+ nr_written, sha1, offset);
close(fd);
}
diff --git a/csum-file.c b/csum-file.c
index ace64f1..2838954 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);