From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs 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 Message-ID: <83fut867lt.fsf@gnu.org> References: <87bn3z4l9i.fsf@mat.ucm.es> <1444321464004323@web25h.yandex.ru> <877felj69g.fsf@mat.ucm.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1464022352 19247 80.91.229.3 (23 May 2016 16:52:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 May 2016 16:52:32 +0000 (UTC) Cc: dgutov@yandex.ru, 23595@debbugs.gnu.org To: Uwe Brauer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 23 18:52:22 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1b4t5S-0003sd-KJ for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 May 2016 18:52:14 +0200 Original-Received: from localhost ([::1]:49338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4t5R-0001qr-MB for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 May 2016 12:52:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4t5K-0001qf-Re for bug-gnu-emacs@gnu.org; Mon, 23 May 2016 12:52:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4t5F-0006PV-UB for bug-gnu-emacs@gnu.org; Mon, 23 May 2016 12:52:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4t5F-0006PR-Qn for bug-gnu-emacs@gnu.org; Mon, 23 May 2016 12:52:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1b4t5F-0002Gr-KO for bug-gnu-emacs@gnu.org; Mon, 23 May 2016 12:52:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 23 May 2016 16:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23595 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23595-submit@debbugs.gnu.org id=B23595.14640222858685 (code B ref 23595); Mon, 23 May 2016 16:52:01 +0000 Original-Received: (at 23595) by debbugs.gnu.org; 23 May 2016 16:51:25 +0000 Original-Received: from localhost ([127.0.0.1]:35030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b4t4f-0002G1-BP for submit@debbugs.gnu.org; Mon, 23 May 2016 12:51:25 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b4t4d-0002Fn-Md for 23595@debbugs.gnu.org; Mon, 23 May 2016 12:51:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4t4U-0006Gs-Og for 23595@debbugs.gnu.org; Mon, 23 May 2016 12:51:18 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:45441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4t4U-0006Gg-LS; Mon, 23 May 2016 12:51:14 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3406 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1b4t4S-0007nD-CA; Mon, 23 May 2016 12:51:13 -0400 In-reply-to: <877felj69g.fsf@mat.ucm.es> (message from Uwe Brauer on Mon, 23 May 2016 12:41:47 +0000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:118569 Archived-At: > From: Uwe Brauer > Date: Mon, 23 May 2016 12:41:47 +0000 > Cc: Uwe Brauer , > "23595@debbugs.gnu.org" <23595@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?