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: Sat, 28 Nov 2020 11:28:16 +0100 Message-ID: <7f952834-eed5-0884-80f9-4702663ed37b@gmx.at> 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> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7024"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 28 11:32:06 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 1kixWP-0001gp-KQ for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 11:32:05 +0100 Original-Received: from localhost ([::1]:37064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kixWO-0003wM-Dg for ged-emacs-devel@m.gmane-mx.org; Sat, 28 Nov 2020 05:32:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kixSo-0003PH-Me for emacs-devel@gnu.org; Sat, 28 Nov 2020 05:28:22 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:46937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kixSm-0003xc-Q2 for emacs-devel@gnu.org; Sat, 28 Nov 2020 05:28:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606559297; bh=VmtYtQrO1JkvfF3KxMlXIJtB7C8Dh2Dn8vF3LpwOMEI=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=Av8Nm7Fzp+9VZftAHrq6mGZ6Yr442eArLjI+XS12O/GJM8Semi+Csj/wFyUZd72Fl G0OGw7Nkmw7YCqPrQNDG+PYyweVhMGa17nUbQbnJ6YxQl+nAmp01xGTYhLqt96GYZp w4R5yhIwXMIOPz1UILTKoi8sZw8ppSkDzerg/mZ4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from [192.168.1.100] ([212.95.5.5]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MMXUN-1kSFOQ1Uv9-00JdXq; Sat, 28 Nov 2020 11:28:17 +0100 In-Reply-To: <87v9dp230t.fsf@linux-m68k.org> Content-Language: en-US X-Provags-ID: V03:K1:ix2aRgnSonRjfN99UbyUovL35CoWS8N3WlhrwIpbBVafYOzHxjm H+mxae9G9YIKcBD2IinvK6+JmV4SyVNZSh4YQ1ddreiDqoHRAciSrnynJGS/ehWyFNhnugb CSx2ZKXNb8DDJ6L68hpQNqIPZsRQ5RdTyM3vB+qmWnnwsg2SrIone7u2cb4Vou74N+DWnQR 5hcY+vlvXbfBh2QOSeR9Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:w4r290lqlOs=:tWE+8YPcdPL/GpbHqT3fAH HKTPR7Mlua9J4EKUiaXL2adQTbnsSp1H0T0YB13YRfuMcvotx+zcgL71Yr2+gpX4tuTlmzeKt GwZnvX9c0nigA37SXGzzaZWjIhbnX846ucygKVR0QYNWYhV6V7Sh5rx7ss6s1biuJRMR6tDis ADqYdCqjmYd9zkCX5EuW0DvQaFRngzzLjG35bNQvxDFOLpvmq5il0raC0P+QZtdiV+UbrV9AC OcZcErZpa/V8pEMbocQDYpqfmaTQTYabtZnGT8Z7OOCOxdkkaFMQRVvMonON1cfSRY0+76xcN b4fQe+7HmGFTz5rZHrdl7Jh0rXnP5AWg+mCXZ43jiUDgg4fKlDJk869rkFNbUVKhqwjw2m2Q8 ka70JNewxpVF7VJCMRoN9gxMkhVWR9u5Lg8+jer+YYfDlxlJATcffcRAuPL2/B4VLxqo+NSTe 14TICj45OeElzg98MCzFH4Xd914NFyLJ+1BmqwCTujLATm2mruFDeTZPJfiQfbuARNufN7yEE 33HnrNgZoCRd+iosOfSH4jjYUMr2sMLvBu93S4zHa5V18zZU66N+is64KxHGDINKhKRdvVZxX ZEpUYQvLVwVqqzfAIsjN0EL3p5ygN1ko5fwGexKBHFYKTnh/dPL5UYbxg5canQBP2pYTJmSq3 0fnqJm645pUyR7YK4zxnRMa+TyKyb6Sn0w0QJ/hWqcIJXgRRslEyKpQj4oZ6aYjlxKEsazD7n kXsi5OJGgJx/ilemv9LF9R8vDXF46/vEZ0gJkAzMqbXhqJnPVSMjZ7P+wYTG3fvr+BOn8268 Received-SPF: pass client-ip=212.227.17.21; 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:259948 Archived-At: >>> What does git status tell? >> >> You probably mean git status after git apply. > > No, before. > >> It just lists the changed files and doesn't care about the whitespace= >> problem. > > This is not useful. Be precise. Don't leave anything out. The entire sequence is: martin@restno:~/emacs-git/trunk$ git status Auf Branch master Ihr Branch ist auf demselben Stand wie 'origin/master'. Unversionierte Dateien: (benutzen Sie "git add ...", um die =C3=84nderungen zum Commit = vorzumerken) obj-gtk-2/ obj-gtk/ obj-lucid/ obj-motif/ obj-none/ obj-ns/ obj-opt/ obj-wo/ nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien (benutzen Sie "git add" zum Versionieren) martin@restno:~/emacs-git/trunk$ git apply /home/martin/temp/master..chan= ges-2020-11-28.diff /home/martin/temp/master..changes-2020-11-28.diff:3847: space before tab = in indent. cont =3D foreach_window_1 (XWINDOW (w->contents), fn, user_data); warning: 1 Zeile f=C3=BCgt Whitespace-Fehler hinzu. martin@restno:~/emacs-git/trunk$ git status Auf Branch master Ihr Branch ist auf demselben Stand wie 'origin/master'. =C3=84nderungen, die nicht zum Commit vorgemerkt sind: (benutzen Sie "git add ...", um die =C3=84nderungen zum Commit = vorzumerken) (benutzen Sie "git checkout -- ...", um die =C3=84nderungen im = Arbeitsverzeichnis zu verwerfen) ge=C3=A4ndert: lisp/cus-start.el ge=C3=A4ndert: lisp/face-remap.el ge=C3=A4ndert: lisp/mouse.el ge=C3=A4ndert: lisp/simple.el ge=C3=A4ndert: lisp/window.el ge=C3=A4ndert: src/alloc.c ge=C3=A4ndert: src/buffer.c ge=C3=A4ndert: src/buffer.h ge=C3=A4ndert: src/data.c ge=C3=A4ndert: src/dispextern.h ge=C3=A4ndert: src/dispnew.c ge=C3=A4ndert: src/eval.c ge=C3=A4ndert: src/font.c ge=C3=A4ndert: src/frame.c ge=C3=A4ndert: src/frame.h ge=C3=A4ndert: src/indent.c ge=C3=A4ndert: src/keyboard.c ge=C3=A4ndert: src/lisp.h ge=C3=A4ndert: src/nsterm.m ge=C3=A4ndert: src/w32fns.c ge=C3=A4ndert: src/w32term.c ge=C3=A4ndert: src/widget.c ge=C3=A4ndert: src/window.c ge=C3=A4ndert: src/window.h ge=C3=A4ndert: src/xdisp.c ge=C3=A4ndert: src/xfaces.c ge=C3=A4ndert: src/xmenu.c ge=C3=A4ndert: src/xterm.c Unversionierte Dateien: (benutzen Sie "git add ...", um die =C3=84nderungen zum Commit = vorzumerken) obj-gtk-2/ obj-gtk/ obj-lucid/ obj-motif/ obj-none/ obj-ns/ obj-opt/ obj-wo/ keine =C3=84nderungen zum Commit vorgemerkt (benutzen Sie "git add" und/o= der "git commit -a") martin@restno:~/emacs-git/trunk$