Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint

diff --git a/utf8.h b/utf8.h
index e4d9183c5fec81f8dbc75d1f2aea136f9b397a72..e7b2aa416844a0b2ccb2d2cf8a1bce68c4d60be1 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -13,6 +13,9 @@ int same_encoding(const char *, const char *);
 __attribute__((format (printf, 2, 3)))
 int utf8_fprintf(FILE *, const char *, ...);
 
+extern const char utf8_bom[];
+extern int skip_utf8_bom(char **, size_t);
+
 void strbuf_add_wrapped_text(struct strbuf *buf,
                const char *text, int indent, int indent2, int width);
 void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,