Merge branch 'os/commit-submodule-ignore' into maint

diff --git a/streaming.h b/streaming.h
index 589e857b8c4ad68e30b91da2eb29a076b98ef903..1d05c2a465c2c26f26b15a1a07cce6282ee5c0c3 100644 (file)
--- a/streaming.h
+++ b/streaming.h
@@ -10,6 +10,8 @@ struct git_istream;
 
 extern struct git_istream *open_istream(const unsigned char *, enum object_type *, unsigned long *, struct stream_filter *);
 extern int close_istream(struct git_istream *);
-extern ssize_t read_istream(struct git_istream *, char *, size_t);
+extern ssize_t read_istream(struct git_istream *, void *, size_t);
+
+extern int stream_blob_to_fd(int fd, const unsigned char *, struct stream_filter *, int can_seek);
 
 #endif /* STREAMING_H */