Merge branch 'jc/check-attr-honor-working-tree' into maint

diff --git a/convert.h b/convert.h
index d799a165b4731f2a44a44eaceffc588d1e9fcfc3..0c2143c152734feb3bdc7ba44b61b8327f02881c 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -40,10 +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)
+{
+       return convert_to_git(path, src, len, NULL, checksafe);
+}
 
 /*****************************************************************
  *
- * Streaming converison support
+ * Streaming conversion support
  *
  *****************************************************************/