Merge branch 'ah/submodule-typofix-in-error'

diff --git a/convert.h b/convert.h
index 0c2143c152734feb3bdc7ba44b61b8327f02881c..d9d853cd3d2f6d94965a2c2fc8e587386402a83b 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -40,11 +40,15 @@ extern int convert_to_working_tree(const char *path, const char *src,
                                   size_t len, struct strbuf *dst);
 extern int renormalize_buffer(const char *path, const char *src, size_t len,
                              struct strbuf *dst);
-static inline int would_convert_to_git(const char *path, const char *src,
-                                      size_t len, enum safe_crlf checksafe)
+static inline int would_convert_to_git(const char *path)
 {
-       return convert_to_git(path, src, len, NULL, checksafe);
+       return convert_to_git(path, NULL, 0, NULL, 0);
 }
+/* Precondition: would_convert_to_git_filter_fd(path) == true */
+extern void convert_to_git_filter_fd(const char *path, int fd,
+                                    struct strbuf *dst,
+                                    enum safe_crlf checksafe);
+extern int would_convert_to_git_filter_fd(const char *path);
 
 /*****************************************************************
  *