Merge branch 'jk/mailmap-only-at-root'

[thirdparty/git.git] / utf8.c

diff --git a/utf8.c b/utf8.c
index 5c8f151f755960abadf210fcb9101ca6c6aec45a..5b39361ada0bbab3dc4df90e64cc6173bb465ff4 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -411,11 +411,10 @@ out:
  */
 static int same_utf_encoding(const char *src, const char *dst)
 {
-       if (istarts_with(src, "utf") && istarts_with(dst, "utf")) {
-               /* src[3] or dst[3] might be '\0' */
-               int i = (src[3] == '-' ? 4 : 3);
-               int j = (dst[3] == '-' ? 4 : 3);
-               return !strcasecmp(src+i, dst+j);
+       if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) {
+               skip_prefix(src, "-", &src);
+               skip_prefix(dst, "-", &dst);
+               return !strcasecmp(src, dst);
        }
        return 0;
 }