Alexandre Julliard wrote: >Junio C Hamano <junkio@xxxxxxx> writes: > > I would say that the patch is an improvement from the current > > code so it should hit 'master'; I was a bit busy lately and then > > am sick, and also we are post -rc1 freeze now and I was being > > cautious, just in case some nacks from more informed parties > > arrive late. > > Sorry for the late nack, but it turns out that this patch breaks diff > output on the Wine server for files that are not utf-8. > > The cause is apparently that decode_utf8() returns undef for invalid > sequences instead of substituting a replacement char like > decode("utf8") does. > > That may be considered an Encode bug since we are running a fairly old > version (1.99, coming with Debian 3.1), but I'd rather not upgrade > perl on the server. Could the patch be reverted, or done differently? I hit the same problem: http://marc.info/?l=git&m=117978122420441&w=2 On my system, I use this patch as workaround: http://marc.info/?l=git&m=118038526531694&w=2 mfg Martin Kögler - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html