GNU bug report logs - #23595
25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS)

Previous Next

Package: emacs;

Reported by: Uwe Brauer <oub <at> mat.ucm.es>

Date: Sat, 21 May 2016 13:03:01 UTC

Severity: normal

Found in version 25.1.50

Done: Dmitry Gutov <dgutov <at> yandex.ru>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Eli Zaretskii <eliz <at> gnu.org>
To: Uwe Brauer <oub <at> mat.ucm.es>
Cc: 23595 <at> debbugs.gnu.org, dgutov <at> yandex.ru
Subject: bug#23595: 25.1.50; file with chinese/japanse chars, vc-diff fails (HG, Git, RCS)
Date: Mon, 23 May 2016 19:51:10 +0300
> From: Uwe Brauer <oub <at> mat.ucm.es>
> Date: Mon, 23 May 2016 12:41:47 +0000
> Cc: Uwe Brauer <oub <at> mat.ucm.es>,
> 	"23595 <at> debbugs.gnu.org" <23595 <at> debbugs.gnu.org>
> 
> I don't care so much about the difference for the (short) Asian
> text, but I do care about the fact that now the file seems to be
> «doomed» in the sense that the diff of each and every new commit
> ends up in Chinese, that is the file is considered as binary from
> now on and that is really bad.

I'm guessing that Git uses the same strategy as GNU Diff for detecting
binary files, which AFAIR is by looking for binary nulls (Paul can
correct me if I'm wrong).  And UTF-16 encoded files have lots of
binary nulls.

However, using the --text switch to "git diff" ought to fix that.
Does it?




This bug report was last modified 9 years and 24 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.