Merge branch 'pt/git-gui' into maint

diff --git a/csum-file.h b/csum-file.h
index 01f13b550118769ed7fbe35fce9bd8c91d87e42d..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;