summaryrefslogtreecommitdiff
path: root/csum-file.h
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-10-10 08:39:20 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-10-10 08:39:20 -0700
commite782e12f89955dfb0be82098af3cfdd8dd0eaf80 (patch)
treebeaefcdcab01a967d65e5f7373d2a7997fda8335 /csum-file.h
parent23abd3f48cb217d1558fa1984bfa8c502717c08f (diff)
parentff74126c03a8dfd04e7533573a5c420f2a7112ac (diff)
downloadgit-e782e12f89955dfb0be82098af3cfdd8dd0eaf80.tar.gz
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/csum-file.h b/csum-file.h
index 9e13342eb3..294add2a91 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 *);