Add branch --set-upstream

diff --git a/csum-file.h b/csum-file.h
index 1af76562f31da89e4cd2592079edb9c6a45736e3..294add2a91496355b42ce02ecfe9c453d21b291a 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -7,7 +7,7 @@ struct progress;
 struct sha1file {
        int fd;
        unsigned int offset;
-       SHA_CTX ctx;
+       git_SHA_CTX ctx;
        off_t total;
        struct progress *tp;
        const char *name;
@@ -16,10 +16,15 @@ struct sha1file {
        unsigned char buffer[8192];
 };
 
+/* sha1close flags */
+#define CSUM_CLOSE     1
+#define CSUM_FSYNC     2
+
 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 *, int);
+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 *);