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:54:13 +0200 Message-ID: <58ECE005.7050301@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: 7bit X-Trace: blaine.gmane.org 1491918997 31715 195.159.176.226 (11 Apr 2017 13:56:37 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 13:56:37 +0000 (UTC) Cc: Paul Eggert , Michal Nazarewicz , emacs-devel To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 15:56:33 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 1cxwHX-00089Y-M0 for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 15:56:31 +0200 Original-Received: from localhost ([::1]:39441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxwHd-0005qx-GY for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 09:56:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxwFz-0004ti-NW for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxwFv-0005LU-SI for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:55 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:54764) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxwFv-0005Kz-HS for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:54:51 -0400 Original-Received: from [192.168.1.100] ([213.162.68.37]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LbdE3-1cEPIL3wWR-00lBp9; Tue, 11 Apr 2017 15:54:23 +0200 In-Reply-To: X-Provags-ID: V03:K0:sqIxnh20vAsb2SNFBxM2H8InschzQbRlA4M0Qi6s33MsyvZH/r7 jRx2hr2OquM97gDH9dYKd6mrYFVqp8P/qPjnGZqfE6VjgPtBXMkTUaWxsw9cc/4XXuYRWO3 S8bLo65vCPJKg1/RGFBCymx2f8aY6FWs0SGXvztAJkWIXsXtKXb5GeREOwAlvLNsPCZHaw2 +qAgac4lfPSpunFkon8cQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:DxLlZxJ8oy8=:1vwGXaErufb921LzIy12VG 5gUm5yNGkMqdKRSYH7Q1jqGlw9dcvSwmjYtEiiFwhz2tsNdpdUR/OS/JNTTy1s0CoyTvdCe90 Vyfz2rb/cThJXd9T/z1CUCsARaShtRTJ6C37V+6BM3djb/Ej3QDrRy9wziG8z73Qs7lTyZVYs 6bighraBnHOpuwHjMqkqPxCDc+5/KQPqszzaq2RCcSrUSN7PAaks1zHnP5XAEtqn5vJQvYCLa f0VgvnvI0DHWPnKPn1RP/A29bOqolBdqzTYkUi4T8okmxw5L68nRlyiPstjNrrL/SXdlYQErZ y6PKpSblfe5z14em3X3Xfu6hqqO4AgV4/UHfxpPkx4kuNCvEN7uoFB7Z9OLP/AchNbyRrTOda 03UTGnAhGwq98viaHWdEM+ToXxwDv1RvypiOKrwleR/aBpxkbkOVyS4NNLFqm0wIr1jSNy+p8 AF76OqF7rirBLID1WqO3DzVquCpHfiOP7u6bKBzDWdxzkJElb1+HE2Jf2pyz2PREStVKUHqOw bdVcQXypCZ4ChCMW8eM3kp7yB/cOx22tbrXEOJfqA6JRwAsPzdsU1DN4ucc6ds94HZSwJDzo9 EUKBGm4Ul+UHk9d6UBgT6/DHSCu6Iuf2P9JD1VRKqUxYsS0OTgEPirN759GEP3VWFlZz51Akg JMoQkeoNs6o5hYjSbNW/RK3HCYpu3XYj2v0ijPJie2EwRvzf7/jS1cOCqSrqBZVG0RecEdGnS 3y/8EdKbiYimc4c0/4kfSm7aQJ8h1+p14TLTmX7r0ogq+3oq78PclwqrPzDYcTTHk+5uPTF5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.18 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:213863 Archived-At: > If you merge that commit or any child of it *with* > conflicts (the conflicts can be unrelated) then the whitespace check > is triggered when you commit the resolution. I have definitively encountered this case before too. > Furthermore, I believe the whitespace check is only installed if you > run './autogen git' or './autogen all'. If you just plain './autogen' > then the git hooks are not installed. I always run './autogen.sh' because IIRC that is (or at least was) the recommended way. > I guess most people are rebasing instead of merging or didn't install > the git hooks and hence don't see this kind of failure. I never rebase. Whether and how I installed the hooks is beyond my knowledge. But IIUC Michael who committed the changes in SpecialCasing.txt did not install the hook. martin