pull --rebase: exit early when the working directory is dirty

diff --git a/utf8.h b/utf8.h
index 15db6f1f27ef7a1f056d5b6adca901f092036f82..98cce1b038a908bec51ccd2f7e1c1f648cb429a1 100644 (file)
--- a/utf8.h
+++ b/utf8.h
@@ -1,7 +1,10 @@
 #ifndef GIT_UTF8_H
 #define GIT_UTF8_H
 
-int utf8_width(const char **start);
+typedef unsigned int ucs_char_t;  /* assuming 32bit int */
+
+ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p);
+int utf8_width(const char **start, size_t *remainder_p);
 int is_utf8(const char *text);
 int is_encoding_utf8(const char *name);