diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:54:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:54:51 -0700 |
| commit | d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340 (patch) | |
| tree | 2475a33111f13c32a4e8540fb9d273bee0c5c601 /csum-file.h | |
| parent | 54dbc1f9e6451b6673835259ce8aa450489fc420 (diff) | |
| parent | 3de89c9d4216d0fdc11bd1141c419ac4d0d35fed (diff) | |
| download | git-d907bf8ef327cd47433d4a4bb0a1bb4e96b6e340.tar.gz | |
Merge branch 'jc/index-pack'
* jc/index-pack:
verify-pack: use index-pack --verify
index-pack: show histogram when emulating "verify-pack -v"
index-pack: start learning to emulate "verify-pack -v"
index-pack: a miniscule refactor
index-pack --verify: read anomalous offsets from v2 idx file
write_idx_file: need_large_offset() helper function
index-pack: --verify
write_idx_file: introduce a struct to hold idx customization options
index-pack: group the delta-base array entries also by type
Conflicts:
builtin/verify-pack.c
cache.h
sha1_file.c
Diffstat (limited to 'csum-file.h')
| -rw-r--r-- | csum-file.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/csum-file.h b/csum-file.h index 294add2a91..6a7967c6bf 100644 --- a/csum-file.h +++ b/csum-file.h @@ -6,6 +6,7 @@ struct progress; /* A SHA1-protected file */ struct sha1file { int fd; + int check_fd; unsigned int offset; git_SHA_CTX ctx; off_t total; @@ -21,6 +22,7 @@ struct sha1file { #define CSUM_FSYNC 2 extern struct sha1file *sha1fd(int fd, const char *name); +extern struct sha1file *sha1fd_check(const char *name); extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp); extern int sha1close(struct sha1file *, unsigned char *, unsigned int); extern int sha1write(struct sha1file *, void *, unsigned int); |