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: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Date: Wed, 12 Apr 2017 11:30:49 +0200 Message-ID: <58EDF3C9.3010801@gmx.at> References: 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 1491989554 6377 195.159.176.226 (12 Apr 2017 09:32:34 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 12 Apr 2017 09:32:34 +0000 (UTC) Cc: Andreas Schwab , Paul Eggert , emacs-devel To: Noam Postavsky , Yuri Khan Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 12 11:32:30 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 1cyEda-0001Zb-1o for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 11:32:30 +0200 Original-Received: from localhost ([::1]:43151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyEdg-0008BK-14 for ged-emacs-devel@m.gmane.org; Wed, 12 Apr 2017 05:32:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyEcQ-00088F-TW for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:31:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyEcN-00075S-09 for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:31:18 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:55928) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyEcM-00075G-MJ for emacs-devel@gnu.org; Wed, 12 Apr 2017 05:31:14 -0400 Original-Received: from [192.168.1.100] ([213.162.68.34]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LkTSx-1cMymu0E9b-00cMsG; Wed, 12 Apr 2017 11:30:59 +0200 In-Reply-To: X-Provags-ID: V03:K0:Lb50iOD+Q7sogQc3oD8r+zaXkQLpYpMbpEZJEYwJvVH4B1x/+Jk SmK7IXoYXqhIL7g71VXAiHiMzoW8PO/qif3bZPFWG+wWMyiOFRXX7tYBQD1BiNlBU7BdJ9N St2o7vMsD1QWm0BeWq7HL1PmGAm0MO8HjMW14MLrB5q/ps7EsdCDlYXi5BdAJAMvwQtAdB0 aIyd/Cl40PrE26BnUVGLA== X-UI-Out-Filterresults: notjunk:1;V01:K0:eNYbhUlPcPg=:TwwfIs044+nBXJQTjWdAvM H3HK7QGlQbb6k2BTmjjG2gW7ZRNM80+MnK3ONtJfeXolSH3v2XK3XW9PiCRCjf7cBBwiznM1Q zPitO2CdPSv6b9xDeOlaE7lh8mKe1Aeue89XwR4CU8aer9J+r3/wItyPSIjI5V2Wzux25TRnC sYpFvXkMcoNEAVRZivfgLVSrtgNAyrjTvicxHYJxPE+owf6Mi0OKz0cq8CIPn8AezIdxMqJgb POi+A1i7lmVcdUKSbyWTP0rHneXp2UHYSt2Cj/6/tzIO4uWYmPKbQ9g52yvr7EUL4PJfYO8NQ fpZK7ySf/x0f9iYjyVrpaNPqISTuR/h3SCznJ5G/Mqqmqv38aEkaGd7o4ZO6+KJZhXwOYkXCM X+L88N/lbRfRaGWFeIdegrhs3oXVKUuoxEFhktcwGSTZy02Brm/nLNCIAzuG3AVzMTP5enz8I DYKesvPMa3xuCjuNlXplN/f4QUOMtAttVUF46m8k1wSqPuH280qzAyDFOLiQC7PWgcyJyF3Sx HgiMvwPd1mhJftyjvnFjwjyymX74MM0jP+ndIZ4BEl6xuC5R4qYHPB9zALVHrlPoigEWm4Q3A y/y4dMJhXxOjSFE0cCQ8lW3LF/1WmXX27Dvn6XYIKZH2SERCrQB3I2/XqWwCi4VNisT8w06d/ OobTzr4cExmswrBEMpOtnd9qePxvi1AZcMs4ras6R1EvizEKUgH70z5+usFRNbaLV02WIo38w TD95qeqNjOJyt0IGT8D3XWfZKWKphWABfGow/vXaHuRU6K/p1Wme8ox6yceVYe9/VDJJnTsn X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.22 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:213900 Archived-At: > Perhaps we should change the hook so that it doesn't complain about > problems from merges? If it (a) solves the problem and (b) there is no strict policy wrt whitespace commits, I'd strongly favor such a solution. Thanks, martin