diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:46:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-02 17:46:48 -0700 |
| commit | 53b543ab8218cede7fb9383298c00dcef663692c (patch) | |
| tree | 89a69be506e7249d687934dbb7aa4266201c4aaf /fast-import.c | |
| parent | f3db366770ffc67196ee13cdcb65c6bfb45821f6 (diff) | |
| parent | d35825da6d5570524234e1bfe4ff0f57957b6db3 (diff) | |
| download | git-53b543ab8218cede7fb9383298c00dcef663692c.tar.gz | |
Merge branch 'np/maint-safer-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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index acb8e2e360..ccdf2e57b0 100644 --- a/fast-import.c +++ b/fast-import.c @@ -951,7 +951,8 @@ static void end_packfile(void) close_pack_windows(pack_data); fixup_pack_header_footer(pack_data->pack_fd, pack_data->sha1, - pack_data->pack_name, object_count); + pack_data->pack_name, object_count, + NULL, 0); close(pack_data->pack_fd); idx_name = keep_pack(create_index()); |