Merge branch 'mm/pull-upload-pack' into maint

diff --git a/strbuf.c b/strbuf.c
index 0d4f4e54ec1ff1f0d37155e8049476d802a7c7e5..bbaf32eef6b0b36ea52390be3aee2ffab7f24f13 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -526,9 +526,10 @@ int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
        return 0;
 }
 
-int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
+ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
 {
-       int fd, len;
+       int fd;
+       ssize_t len;
 
        fd = open(path, O_RDONLY);
        if (fd < 0)