From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Tue, 11 Apr 2017 15:53:42 +0200 Message-ID: <58ECDFE6.1060903@gmx.at> 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; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1491918943 27555 195.159.176.226 (11 Apr 2017 13:55:43 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 13:55:43 +0000 (UTC) Cc: Andreas Schwab , Paul Eggert , emacs-devel To: Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 15:55:39 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 1cxwGf-00072p-IS for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 15:55:37 +0200 Original-Received: from localhost ([::1]:39439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxwGj-0005OU-TT for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 09:55:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxwFH-0004R5-Kg for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxwFB-0004sR-TW for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:11 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:54159) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxwFB-0004rg-Im for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:05 -0400 Original-Received: from [192.168.1.100] ([213.162.68.37]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M7Gj8-1cAlEM3MEo-00x0Tq; Tue, 11 Apr 2017 15:53:52 +0200 In-Reply-To: X-Provags-ID: V03:K0:DKTXeMLemf8efJTbEWEp2ooWX0stp0+HuprRjWqpciCMYWHX8E5 mMqOWw+pkEosHSJ7rS/ZSMWlgXoE1cj2KJPLkqJtwR/DtPYlmevAZkE5eyoHdeOpXqgiSi3 50tpoYyAh5ke2r3wLx3HIlH5OvooQYv6ZE+naPuItDuoQMR4fnMY9QC2lVxihljkrUR5+A9 bmZr8eQ96A95IVT7U47aQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:VQ8DliZAT4E=:WfWNGFaHO3jCy/HlwLBZ3s jxI0KYNG2SCtldfdYyxlgboqAy9QpRRrTtYZB/CDzrYfD0cSW/3Gqe5rb2WqP0sCea7AXpxdg XY1jQQ5QsTJKb5a632wEwBwwcI4Phql6AVbgzzCErGSAseV3xqAvVhUPa57+H/5lS4Vz1J6Ne jvM2OhfkRImVd9UVwXqZXZoVy/YvXkygf+zbvHky9tMskFFggGru/ZYDzQ3/Qn32rIM1BkudZ KCxxRChWvwRwQWAZ5YKBdUKVsrKXbp4qr6XvULy+YhnCJKXVJ9LzuS+2PQG7h3WiT8c/0xXE6 rp5uNJbC94zlWqP2Sq0BtDHzqDHV92EZOnGyD7IOZj+Azqutv5enibWZo6fHOun2pjH+JQIVT 6BQEw97CfYSsQvmVQlxzIztHau/nubhR871n71XeXsf+CKuMfe8EM0ppwrhKJ5c6ND445e14W 3Asj6t2AB3E2kzmNqsirPAn4fXTLgsqQSHuD2WU0QlJnNYVaoeKoPJNTPlWzUZ2ddeF9dmV8k KhINYNf75pOVXvXx/ASvnqZdQ5/tkJRZBfgoI9/CMWMU6B2B1Ptrsqov5q8LuonBA5SRqF6NO ykZok/lmq23HcePMVyYAeigPzyIaQW64XRJzoXCRKiHTzZ+BFCnEKV1buIzxIVCBjCAQh2VT9 vRyGhaxUKfXMR/+76MA+OmOXO1SWNrANYLC/WzhY7JNep13Q13UMa1+MR9SrqkhgR0AkddiDQ 9SOoyWRS6aAZgzx0PSrY0xg2ByxbjrQ5DHnOJQU+tDmC+bLKlxloaqsd+izb0a/04MEDE5rQ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.19 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:213862 Archived-At: > Martin, you=E2=80=99re trying to solve three problems at once. Aha.. thanks in advance for your attention. >> 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=9C= WARNING: 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 OK. That looks like a good idea. I suppose this could also help me with git's help which currently always redirects me to my browsers. I have never tried to delve into git's options because I usually get lost in its documentation. > The latter would be a good configuration for =E2=80=98shell=E2=80=99 b= uffers 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 inst= alls 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 c= ommitted > once and you=E2=80=99re not likely to need to commit it again unless y= ou=E2=80=99re > upgrading Emacs to a newer version of the Unicode standard. OK. > 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.) No. It just happens on a branch where occasionally conflicts may occur. In the particular case there were no uncommitted and no stashed changes (to my knowledge). > (Also, I always suggest to =E2=80=98git fetch=E2=80=99 first, see if y= our local branch > and the upstream have diverged, and then decide consciously whether > you want a merge, a rebase, or something else entirely. =E2=80=98git p= ull=E2=80=99 > makes the decision for you.) I always want a merge. So what do you recommend? In particular what do you recommend when there are conflicts? IIUC in that case git does not merge anything but waits till I have resolved the conflicts and tells me to commit them when I'm done. If, at that moment, I do commit I'm in the same situation with SpecialCasing.txt as before. Or is there any difference? martin