diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 15:39:20 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 15:39:20 (GMT) |
| commit | e782e12f89955dfb0be82098af3cfdd8dd0eaf80 (patch) | |
| tree | beaefcdcab01a967d65e5f7373d2a7997fda8335 /csum-file.h | |
| parent | 23abd3f48cb217d1558fa1984bfa8c502717c08f (diff) | |
| parent | ff74126c03a8dfd04e7533573a5c420f2a7112ac (diff) | |
| download | git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.zip git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.gz git-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.bz2 | |
Merge branch 'maint'
* maint:
rebase -i: do not fail when there is no commit to cherry-pick
test-lib: fix color reset in say_color()
fix pread()'s short read in index-pack
Conflicts:
csum-file.c
Diffstat (limited to 'csum-file.h')
| -rw-r--r-- | csum-file.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/csum-file.h b/csum-file.h index 9e13342..294add2 100644 --- a/csum-file.h +++ b/csum-file.h @@ -24,6 +24,7 @@ extern struct sha1file *sha1fd(int fd, 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); +extern void sha1flush(struct sha1file *f); extern void crc32_begin(struct sha1file *); extern uint32_t crc32_end(struct sha1file *); |