On Fri, Mar 9, 2018 at 3:22 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> On Fri, Mar 9, 2018 at 12:35 PM, <lars.schneider@xxxxxxxxxxxx> wrote: >>> /* Don't encode to the default encoding */ >>> - if (!strcasecmp(value, default_encoding)) >>> + if (is_encoding_utf8(value) && is_encoding_utf8(default_encoding)) >>> return NULL; >> >> This change belongs in 6/10, not 10/10, methinks. > > It is actually worse than that, no? When default_encoding is > (somehow) configured not to be UTF-8, e.g. "Shift_JIS", we used to > avoid converting from Shift_JIS to Shift_JIS, but the optimization > no longer happens with this code. > > In any case, I think same_encoding() is probably a good thing to use > here at step 6/10, so the point is moot, I guess. Agreed, same_encoding() would be superior.