From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Tue, 11 Apr 2017 20:17:47 +0700 Message-ID: References: <58CB9F6B.5080806@gmx.at> <83h92sz2j9.fsf@gnu.org> <58CBAEB7.5030601@gmx.at> <58CBBC6C.8000104@gmx.at> <58D380FF.1070103@gmx.at> <58D3C84E.5080808@gmx.at> <58D4E0D6.2070101@gmx.at> <86mvcap85t.fsf@stephe-leake.org> <58D637CD.1020902@gmx.at> <60eced11-9b48-f24d-88d7-cacb211418c9@cs.ucla.edu> <58ECB63C.30003@gmx.at> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491916857 6250 195.159.176.226 (11 Apr 2017 13:20:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 13:20:57 +0000 (UTC) Cc: Andreas Schwab , Paul Eggert , emacs-devel To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 15:20:51 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxvj1-0001Tk-7M for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 15:20:51 +0200 Original-Received: from localhost ([::1]:39256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxvj6-0002ST-QL for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 09:20:56 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxvgS-0001Na-6D for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:18:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxvgQ-00075J-RU for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:18:12 -0400 Original-Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:35660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxvgQ-00074V-Id for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:18:10 -0400 Original-Received: by mail-wm0-x22a.google.com with SMTP id w64so63488864wma.0 for ; Tue, 11 Apr 2017 06:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-transfer-encoding; bh=t6Rabe79PjeQHORMUUQa8rDOumkNrDgEjnhrBmT0KSk=; b=TJSMMrc3tPgrS82rO2vd7WAB4/YOblDZl1aDsELep1hOHQV1hpd68m3HY9GLNE6tva lCElCZU7nxV55wIbyXK6MVV60/JNJ3Zu7rqyPt3ae8ADKs535K5eXUtZYVlWHn6JO4kR b5uHIWdeqvawm6qsP1U1prSlRDnaiQYrmwZ30ChHwrzlXsKGxCqpRdJDnWM1uuVQhSt7 hVY6YTSGItaw6GiVjMNbpr+7/WUuFLbMEXlfzZ2ixHtYN+/cAYvx09JXj7lZmyKAQUgs V9gjm6bcAF5+lFcRIvewYlSNbb3jaQUsMCcyCIJPoruZfYG+P8CTXlGdZckatBvjWGz6 AtVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-transfer-encoding; bh=t6Rabe79PjeQHORMUUQa8rDOumkNrDgEjnhrBmT0KSk=; b=j4QcH8zeP3nD7MhK/sflhkL7y2WZlhWpjVlbf6ofVyXhHQ+dh1dddp0lQjNu6ikxRU CkwTv8FPJ7wav/nwMftLV9+0QajfqGZ+Of4zYQiO1dUZ6WHHNW1OlOa1YtzG+6lgWFqn L/9xJCJw1KVGMwjkVRCVPiIsts+RBJvq0wCvLL4slr2mnnRIgzmYfkgikMy22Ih1x/o8 mSvdbn7rCjcwABsdQ3ky4wDdp3eFXU2NlbicNGjeWZHCfzPqqcjRAjRDElXoWA3Q3uei QrWlSlnIKlm0lfng2s/nhyOTNMmjJSNZpDthbLEk6m5V1+WIH1C1nTuwG2yqvfgRLWje oDHw== X-Gm-Message-State: AN3rC/4T0p7WlDM+FL8Kp7yQdm9w2SdFNl3pT3mXyHzf97k06BkAlL+PHaUXinzTFljBccZTJCbzdTAJxatixQ== X-Received: by 10.28.34.130 with SMTP id i124mr111914wmi.111.1491916688014; Tue, 11 Apr 2017 06:18:08 -0700 (PDT) Original-Received: by 10.223.169.12 with HTTP; Tue, 11 Apr 2017 06:17:47 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: MEyyDuNlE1oxKvfxnCciPZpYqtA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22a X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:213854 Archived-At: On Tue, Apr 11, 2017 at 7:13 PM, Andreas Schwab wrote: > On Apr 11 2017, martin rudalics wrote: > >> Today again git complained about my dumb terminal Martin, you=E2=80=99re trying to solve three problems at once. > What does that mean? Normally, Git pipes its output through =E2=80=98less -FRX=E2=80=99, so that= the user can scroll through long logs or diffs at his or her pace. However, that requires a terminal that supports cursor addressing, so that less(1) could erase the previous screen and re-draw the new one. In my Emacs, less(1) invoked from =E2=80=98shell=E2=80=99 says =E2=80=9CWAR= NING: terminal is not fully functional=E2=80=9D. It then sort-of works but is ugly and a bit pointless within Emacs which implements its own scrolling. To tell Git not to use paging: $ git config --global core.pager cat or: $ export GIT_PAGER=3Dcat The latter would be a good configuration for =E2=80=98shell=E2=80=99 buffer= s in Emacs. See =E2=80=98git help config=E2=80=99 for more technical details. Paging is, however, entirely independent of trailing whitespace checking. Git by default does not treat trailing whitespace as errors, but provides an easy way to enable that as a sample pre-commit hook. In the Emacs repository, running =E2=80=98autogen.sh git=E2=80=99 installs = a pre-commit hook from build-aux/git-hooks that actually invokes the check in its last line. The file admin/unidata/SpecialCasing.txt does in fact fail this check. But that=E2=80=99s okay because it has been commit= ted once and you=E2=80=99re not likely to need to commit it again unless you=E2= =80=99re upgrading Emacs to a newer version of the Unicode standard. Why you are getting in the situation where you need to commit SpecialCasing.txt when pulling is a different issue. What is your workflow, starting with a checkout and up to pulling? Do you by any chance try to pull while your working tree has uncommitted changes? (That has a high confusion potential. Commit first, pull later.) (Also, I always suggest to =E2=80=98git fetch=E2=80=99 first, see if your l= ocal branch and the upstream have diverged, and then decide consciously whether you want a merge, a rebase, or something else entirely. =E2=80=98git pull= =E2=80=99 makes the decision for you.)