diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-17 06:33:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-17 06:33:40 (GMT) |
| commit | 48b303675aa238c209e527feadcbb7ba1c025c97 (patch) | |
| tree | 6a48f4388867f836db0e4c015098348079a9185d /cache.h | |
| parent | e45c9b03c32620c444f464403c23534160998624 (diff) | |
| parent | 568508e76570e9ea36aad6446959424cebcf0535 (diff) | |
| download | git-48b303675aa238c209e527feadcbb7ba1c025c97.zip git-48b303675aa238c209e527feadcbb7ba1c025c97.tar.gz git-48b303675aa238c209e527feadcbb7ba1c025c97.tar.bz2 | |
Merge branch 'jc/stream-to-pack'
* jc/stream-to-pack:
bulk-checkin: replace fast-import based implementation
csum-file: introduce sha1file_checkpoint
finish_tmp_packfile(): a helper function
create_tmp_packfile(): a helper function
write_pack_header(): a helper function
Conflicts:
pack.h
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -35,6 +35,7 @@ int git_inflate(git_zstream *, int flush); void git_deflate_init(git_zstream *, int level); void git_deflate_init_gzip(git_zstream *, int level); void git_deflate_end(git_zstream *); +int git_deflate_abort(git_zstream *); int git_deflate_end_gently(git_zstream *); int git_deflate(git_zstream *, int flush); unsigned long git_deflate_bound(git_zstream *, unsigned long); @@ -597,6 +598,7 @@ extern size_t packed_git_window_size; extern size_t packed_git_limit; extern size_t delta_base_cache_limit; extern unsigned long big_file_threshold; +extern unsigned long pack_size_limit_cfg; extern int read_replace_refs; extern int fsync_object_files; extern int core_preload_index; |