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: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Date: Sat, 29 Apr 2017 19:25:17 -0400 Message-ID: References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> <83shkrkote.fsf@gnu.org> <83mvazkmk1.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: blaine.gmane.org 1493508365 4792 195.159.176.226 (29 Apr 2017 23:26:05 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 29 Apr 2017 23:26:05 +0000 (UTC) Cc: martin rudalics , Yuri Khan , Paul Eggert , Andreas Schwab , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 30 01:25:57 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 1d4bkQ-00012q-Np for ged-emacs-devel@m.gmane.org; Sun, 30 Apr 2017 01:25:54 +0200 Original-Received: from localhost ([::1]:42793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4bkW-0002iC-8q for ged-emacs-devel@m.gmane.org; Sat, 29 Apr 2017 19:26:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4bjt-0002i7-FE for emacs-devel@gnu.org; Sat, 29 Apr 2017 19:25:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4bjs-0004Ys-KL for emacs-devel@gnu.org; Sat, 29 Apr 2017 19:25:21 -0400 Original-Received: from mail-oi0-x22c.google.com ([2607:f8b0:4003:c06::22c]:35599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4bjr-0004YN-96; Sat, 29 Apr 2017 19:25:19 -0400 Original-Received: by mail-oi0-x22c.google.com with SMTP id l18so1927613oig.2; Sat, 29 Apr 2017 16:25:19 -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=LK3nXE/flyRUqsBdylj2Vu/nN15oiSNF6flZFqmEYmY=; b=BwFn4iPBrkl9GtgdAMIjfvPICfgmKzMko+T1zSDFWxEX5ToQO3TqTF+RCNSX0pNwRy 6RXoAsDtN+G6OB5I/Pr/arITNe4JgZ9N7OfTCNlpZV4Fjpe5OQuuvlFX9oyAtx0+lPAm 36q4t5HtcNicls+44Ym8rqkc7VkwGvEI+qvczQRxJbqP0Nl7Y/23CC8nP6DobKXOvEo2 jvoJ8ayACGaWvSJvcc6Ej5LOZnxjirxjpsB9N/4CiQvl664o+fxT/pt11Jh46wcq9xqL cZzox9xpAlD7G6tevNCFuHL/lY+6p5uEZ8bbP4hjaF21hLzTirQ7uVC3I3a+edrBXWTy vAog== 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=LK3nXE/flyRUqsBdylj2Vu/nN15oiSNF6flZFqmEYmY=; b=AlMQ0cd4JqPjZmP3nNpS4U8sbRVwju968A2n/GMwE0yazuN+s4RYlWzzKi6gigX+CQ GckS2lcuaSjRWFNJiR78wLfW7KX5ZKkgVJL6NVAdQ929I27XxtPb5VBICHdNiPhfxqCW xcZD8Qrp8ZIZU/ExTTg9i+uxKQuke4iM9kvyC4sjMQ3nYE87bRktmPdzYYUPXfjo5bwB 1NVAFs4xICnxjqZnHAdhKwbirMA9NizEfcMmdQyUXA+lvWR7QCzHEBw0E3jpSGX3XW1J 5UpwJKfjXjudxMAk+Gyw5Pa94b5czQ3wow6CIyfjtGXbUQ/d54J3nWjQ+8rDzRtPf0tZ UbZg== X-Gm-Message-State: AN3rC/6avM8wQugfbF8cpevRhKtdq2Sk4zlz0bBtiXEUvhzxWQ+tMLoA OuXg7AlumjBTZuykkPz1BrgSvPGP6g== X-Received: by 10.202.94.214 with SMTP id s205mr4356155oib.158.1493508318483; Sat, 29 Apr 2017 16:25:18 -0700 (PDT) Original-Received: by 10.157.25.10 with HTTP; Sat, 29 Apr 2017 16:25:17 -0700 (PDT) In-Reply-To: <83mvazkmk1.fsf@gnu.org> X-Google-Sender-Auth: mBY0LYw2Z68AmMhusCDe8BaqhTM X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22c 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:214429 Archived-At: On Sat, Apr 29, 2017 at 4:04 PM, Eli Zaretskii wrote: >> >> My intuition is that getting a commit hook failure from the commit >> being cherry picked will be less confusing than getting hook failures >> from one of the many commits being merged from a branch, so I don't >> think it's worth updating the hook to avoid this case. > > I don't think I agree. In fact, I think many users will not even > realize that cherry-pick merges, and will be surprised. Hmm, I'm not sure I entirely understand what you're getting at. What exactly do you mean by "merges" in this context?