Make old sha1 optional with git update-ref -d

diff --git a/csum-file.h b/csum-file.h
index c3c792f1b56026b6a4d9d10b6ba63947c7f383cf..72c9487f4fd9fcab5e02fc2dc6afd3cb7f9c036a 100644 (file)
--- a/csum-file.h
+++ b/csum-file.h
@@ -1,19 +1,28 @@
 #ifndef CSUM_FILE_H
 #define CSUM_FILE_H
 
+struct progress;
+
 /* A SHA1-protected file */
 struct sha1file {
-       int fd, error;
-       unsigned int offset, namelen;
+       int fd;
+       unsigned int offset;
        SHA_CTX ctx;
-       char name[PATH_MAX];
+       off_t total;
+       struct progress *tp;
+       const char *name;
        int do_crc;
        uint32_t crc32;
        unsigned char buffer[8192];
 };
 
+/* sha1close flags */
+#define CSUM_CLOSE     1
+#define CSUM_FSYNC     2
+
 extern struct sha1file *sha1fd(int fd, const char *name);
-extern int sha1close(struct sha1file *, unsigned char *, int);
+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 crc32_begin(struct sha1file *);
 extern uint32_t crc32_end(struct sha1file *);