Merge branch 'jk/reflog-special-cases-fix'

[thirdparty/git.git] / object.c

diff --git a/object.c b/object.c
index 2c61e4c86217e633d2e28acd0b3ae654584ede7d..e6a1c4d9059ab398f06f042a7b7cdd953ff6a943 100644 (file)
--- a/object.c
+++ b/object.c
@@ -47,8 +47,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)
                len = strlen(str);
 
        for (i = 1; i < ARRAY_SIZE(object_type_strings); i++)
-               if (!strncmp(str, object_type_strings[i], len) &&
-                   object_type_strings[i][len] == '\0')
+               if (!xstrncmpz(object_type_strings[i], str, len))
                        return i;
 
        if (gentle)