merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/csum-file.h b/csum-file.h
index 72c9487f4fd9fcab5e02fc2dc6afd3cb7f9c036a..3b540bdc21d2edf8d3d6fc2b5e52cc840aa19395 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -6,8 +6,9 @@ struct progress;
 /* A SHA1-protected file */
 struct sha1file {
        int fd;
+       int check_fd;
        unsigned int offset;
-       SHA_CTX ctx;
+       git_SHA_CTX ctx;
        off_t total;
        struct progress *tp;
        const char *name;
@@ -16,14 +17,25 @@ struct sha1file {
        unsigned char buffer[8192];
 };
 
+/* Checkpoint */
+struct sha1file_checkpoint {
+       off_t offset;
+       git_SHA_CTX ctx;
+};
+
+extern void sha1file_checkpoint(struct sha1file *, struct sha1file_checkpoint *);
+extern int sha1file_truncate(struct sha1file *, struct sha1file_checkpoint *);
+
 /* sha1close flags */
 #define CSUM_CLOSE     1
 #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);
+extern void sha1flush(struct sha1file *f);
 extern void crc32_begin(struct sha1file *);
 extern uint32_t crc32_end(struct sha1file *);