Merge branch 'tr/log-full-diff-keep-true-parents' into maint

diff --git a/commit.c b/commit.c
index 5ecdb38b3e7601419eed27ad81063ed6c8e5808e..de16a3c0a2d6693173678247ba0755e4d7483a1c 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1432,7 +1432,7 @@ static int find_invalid_utf8(const char *buf, int len)
                if ((codepoint & 0x1ff800) == 0xd800)
                        return bad_offset;
                /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
-               if ((codepoint & 0xffffe) == 0xfffe)
+               if ((codepoint & 0xfffe) == 0xfffe)
                        return bad_offset;
                /* So are anything in the range U+FDD0..U+FDEF. */
                if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)