fast-import: use write_pack_header()

Call write_pack_header() to hash and write a pack header instead of
open-coding this function.  This gets rid of duplicate code and of the
magic version number 2 -- which has been used here since c90be46abd
(Changed fast-import's pack header creation to use pack.h, 2006-08-16)
and in pack.h (again) since 29f049a0c2 (Revert "move pack creation to
version 3", 2006-10-14).

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 1c85eafe43eb2a4ed46b5aa2687eedf72fe61d54..1bf50a73dc3597394ecf73e5a786fe217e7ef633 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -739,7 +739,6 @@ static void start_packfile(void)
 {
        struct strbuf tmp_file = STRBUF_INIT;
        struct packed_git *p;
-       struct pack_header hdr;
        int pack_fd;
 
        pack_fd = odb_mkstemp(&tmp_file, "pack/tmp_pack_XXXXXX");
@@ -750,13 +749,8 @@ static void start_packfile(void)
        p->do_not_close = 1;
        pack_file = hashfd(pack_fd, p->pack_name);
 
-       hdr.hdr_signature = htonl(PACK_SIGNATURE);
-       hdr.hdr_version = htonl(2);
-       hdr.hdr_entries = 0;
-       hashwrite(pack_file, &hdr, sizeof(hdr));
-
        pack_data = p;
-       pack_size = sizeof(hdr);
+       pack_size = write_pack_header(pack_file, 0);
        object_count = 0;
 
        REALLOC_ARRAY(all_packs, pack_id + 1);