[PATCH] Speed up git-merge-base a lot

diff --git a/sha1_file.c b/sha1_file.c
index e9285c144e05b4b3528c7a96025730dd9a7b3668..8d189d4919f83c243c306973285cefb5b55e2f19 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1388,7 +1388,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
                ssize_t size;
                if (*bufposn) {
                        stream.avail_in = *bufposn;
-                       stream.next_in = buffer;
+                       stream.next_in = (unsigned char *) buffer;
                        do {
                                stream.next_out = discard;
                                stream.avail_out = sizeof(discard);