From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: tabs, git diff and git apply Date: Sun, 29 Nov 2020 10:52:57 +0100 Message-ID: References: <582708de-231a-1792-da69-844faefeaa4c@gmx.at> <87zh31252h.fsf@linux-m68k.org> <4cff3ce3-9695-cd71-0a78-9e95e3a9a252@gmx.at> <87v9dp230t.fsf@linux-m68k.org> <7f952834-eed5-0884-80f9-4702663ed37b@gmx.at> <00241b08-688c-ad95-382f-91d1020531fa@gmx.at> <477cd632-41cd-f22a-c5c2-8f7df616d24d@gmx.at> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4579"; mail-complaints-to="usenet@ciao.gmane.io" Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: "Alfred M. Szmidt" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 29 10:56:28 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kjJRU-00014Y-Jx for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Nov 2020 10:56:28 +0100 Original-Received: from localhost ([::1]:39276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjJRT-0004Q7-F9 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Nov 2020 04:56:27 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjJOB-0003S6-Ou for emacs-devel@gnu.org; Sun, 29 Nov 2020 04:53:03 -0500 Original-Received: from mout.gmx.net ([212.227.17.20]:40161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjJO9-0000hm-N7; Sun, 29 Nov 2020 04:53:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606643578; bh=rbfTH+SttWXTSiZeQvpRxZx8pxZpkkqGHxaZ4PIW5zY=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=Unb0kNub7KExeh9Fdv05IhtymGKshy2Fg6d8DiYCKHVminvbLftWZ2iEgEt1TTTgd 0x38oA+Bk7xjMMi+oOR708RrE4R+y//hrAXhUp7e3X098Pl4E2LOEHB3obYdsnx8iX Ywm2lg+PkxiEvppdmkKEgm13ioJH0D4uilp8otQg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([212.95.5.227]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mv2xU-1jsaHB3vGK-00r2nn; Sun, 29 Nov 2020 10:52:58 +0100 In-Reply-To: Content-Language: en-US X-Provags-ID: V03:K1:90qxUfEh7Bso9717w6+B9zXQ7FhVbR2lvaDgoS8ZFfNrTGWkqa6 4aBzEJA0yeN64AqH5Xw8+rYCZX4AzqgFr/X0cAiCrrCzHxjy02yCdcp9gj7l3H0/1WG4oUY /4MS1DrAClzT4CRKCA6xl5squ+WnOGajeFhmwUauwKXudy/+FfeK5RlyOLM4S50PmQIBAlp 4vXEENlEgFXJqjQvGlWoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:RohzLw9soeU=:7HqTZrs+tIdKfKXC+hXkp4 qxgcFBRvFlY1T8bU4ueRtUDXW2bB4vkp8prgdRoZ8dE3FhH6VKFfKoc4HhtAg58Rw6zZuTqpm mtrebQes7GqXfXm8xTp0/ule9BcpsGpwnsOUFko49ao6G1fEGsY16dkGikhmJpGqVbk1mntI5 ZUFtlbs0BZD/ShjU3fbOl0l7ng/elExMffCWGg/forGQOE+hzHX707geBFSUv3PQuaQs0hm8t TSSAxJsvChkY1ysrZ1vX5Mekowsl9pkkMzjege4oBGe9euQpbKN3DMzqpK1wHF5xan/9x4a6T BPnlwBGaP/Ai34v1/AmTbijKC9QqEvdCoCCHBxiDAHzyM2+uySuVIV7eTSGbtG0qj6sWMlWgS hWMpIUxC6E9d6DnhhIpcEHjhvBzTi51/C8Tw5Ll0oDQPalMJ8LswrpGwca9fwMByzNhqeKhfW SJcTh5IGsFhQetvRavPJ7Xu7ytRwRselzZ2rn+FR0BnQmVkJHjPjJIP5+cXY+GDoDbX1IZSpg YcNcgvu1RztR3PDbC21GTv5T8h5erTM1d+JgxCmGvNFHsMSJv3jrGJt3c1ppqP/ihOw1zuWjV r1mxADVliNrUYzDaBzm9zaYbQQloC2UC17eY+x8hjKmFz0zR/lj7TUAPL498SDDptnU6X7AVu /VGgpt2BvdvUnUbosq0NMAOhTPp855jalGQgWGTosEiVz3SmJSBHKFGDWSFMqL04a1Az08UtE YOkHXcwsnddE6BKeIZyyUXJShSU3lIu8payziiydUUmnODisFj8re6HvA2LjW5DsVjHRhTL3 Received-SPF: pass client-ip=212.227.17.20; envelope-from=rudalics@gmx.at; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259999 Archived-At: > > If you do that again, do you get the same type of diff? > > I get the same result. > > > Does `git > > diff` have a configuration that is doing context diffs? > > Sure. You just have to be able to understand the doc. > > That is easy to verify, and you should be able to do > > HOME=/tmp git diff > > and see if the behaviour still is the same (if it doesn't work, just > running as a different user should). If it isn't, it is a > configuraiton setting that you have done -- reading the git-config man > page would be the next action to see where such a setting is set. But that wasn't my problem. My problem was that I changed a file but did not commit the change. So git diff picked up the pre-change file contents and used them instead of the actual file contents. When I looked at the diff output I was stumped by the fact that it claimed the presence of a SPC character I couldn't find in that file. The rule is to always run git status before git diff but I probably had forgotten it this time. martin