Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4

diff --git a/utf8.h b/utf8.h
index 07e7054343765b624203e79571896cd5411e28fd..5a9e94bee62fd2ed62dcbc82aee12bfc6d75e254 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,