From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: master has switched from Automake to GNU Make Date: Tue, 11 Apr 2017 09:34:00 -0400 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 X-Trace: blaine.gmane.org 1491917658 30051 195.159.176.226 (11 Apr 2017 13:34:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 11 Apr 2017 13:34:18 +0000 (UTC) Cc: Paul Eggert , Michal Nazarewicz , emacs-devel To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 11 15:34:11 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 1cxvvu-0007gB-TW for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 15:34:11 +0200 Original-Received: from localhost ([::1]:39341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxvw0-0004Oe-Qi for ged-emacs-devel@m.gmane.org; Tue, 11 Apr 2017 09:34:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxvvs-0004OM-Fw for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:34:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxvvn-00070J-Ql for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:34:08 -0400 Original-Received: from mail-oi0-x232.google.com ([2607:f8b0:4003:c06::232]:35237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxvvn-0006zt-Kt for emacs-devel@gnu.org; Tue, 11 Apr 2017 09:34:03 -0400 Original-Received: by mail-oi0-x232.google.com with SMTP id f22so53153416oib.2 for ; Tue, 11 Apr 2017 06:34:02 -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; bh=7LwKfOi6xljiBaewAWMdA+6Sv/FWRDBEu+dd1LPa1/I=; b=dNsD7qOy4u9w4Qng0tS+8UM3iZ6yYOdU3fq5YWSZLyXZXWe/MOJB9xyhe7R2yHWh9N xGVDLuamq4uobjZsSoiVMSXBjyw+3V2ragps2YHZWGLO7EKiJ/KssCcOHpltryB+TFnW EjJblMr3+65mCv1KymbkC6Qj9rGTyNOVHbgaigy5ojvb7mQfKmIBx5RL7hjswefrWWUn hI6s3HaW4qvC91z1iRR1cpMeunT9Fot1yk6Twf7f/qn67DMQiV89qvM3wiH/qBdGA+cP vxWh9BeL5Z0X2v010VLH+pH76moPd1/8NqjB7nvG30JT62epLyBzg0p466MZPcKze+Qq +W7g== 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; bh=7LwKfOi6xljiBaewAWMdA+6Sv/FWRDBEu+dd1LPa1/I=; b=YoDNCgg4ichofJu3ZTL07oA8QHHUxz9w5bFJvOxHJR5AcMq19bOM7nUBq5hhH8AN4E lew3laH8tRTdjTeju7GJcSWC1c167UnkrUyqd0cQy4u++aTwZR94CwbrJYmBFziJKtHX BWiiNWHcaW8gGhwa9DEtkRoLfQCW9qkmkFf0nhvicNNYb9QcqYHJfQEg2TpeyOk4PAFb +FcaHSsb9cW9gIiXo0B5Je5G3ptBmoM0ncz+qvdYTVs3sqPOuvJNHRSTvYnIKna8oJiJ FpvVkmS8H/X4Leu3W6L9cOLkyCS8V/2TXp2LzU01HOPQ5Ypah+ZFIeYfTgR7S5+71Z50 n7Kg== X-Gm-Message-State: AN3rC/4RyLitnn4jcNMzjJVupbr5zQ+2kLmB6gePcE/LoQpyBa4/15RDFJIlqCjv10V2F/ooMDKEyLHd2Ghivw== X-Received: by 10.157.43.35 with SMTP id o32mr15411149otb.79.1491917641360; Tue, 11 Apr 2017 06:34:01 -0700 (PDT) Original-Received: by 10.157.80.133 with HTTP; Tue, 11 Apr 2017 06:34:00 -0700 (PDT) In-Reply-To: <58ECB63C.30003@gmx.at> X-Google-Sender-Auth: Jx_g1TZQiopdkPxMCIb6khP-QD0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c06::232 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:213859 Archived-At: On Tue, Apr 11, 2017 at 6:55 AM, martin rudalics wrote: >> That sounds wrong. It never happens to me, I expect because my >> workflow differs. Can you give a way to reproduce your problem? >> Perhaps there's a way we can fix the Git configuration so that it >> doesn't happen to you in the future. > > Today again git complained about my dumb terminal and when I tried to > commit manually it told me: > > martin@NOREST:~/emacs-git/slow$ git commit -m "Dumb" > admin/unidata/SpecialCasing.txt:200: trailing whitespace. > +# The remainder of this file provides conditional casing data used to > produce > admin/unidata/SpecialCasing.txt:281: new blank line at EOF. > > I don't understand our policy wrt trailing whitespace. Even without > that dumb terminal issue I occasionally will have to commit manually > after a pull, for example, when fixing conflicts. I can reproduce this. [1: b3b9b258c4] introduced the trailing whitespace. If you merge that commit any child of it without conflicts, then the whitespace check is not triggered. If you rebase over that commit or any child of it, then the whitespace check is not triggered. 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. 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 guess most people are rebasing instead of merging or didn't install the git hooks and hence don't see this kind of failure. 1: 2017-04-06 20:54:58 +0200 b3b9b258c4026baa1cad3f2e617f1a637fc8d205 Support casing characters which map into multiple code points (bug#24603)