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: Sun, 30 Apr 2017 15:35:55 -0400 Message-ID: References: <955c464e-5833-10fd-9c02-d7edda70e488@cs.ucla.edu> <83shkrkote.fsf@gnu.org> <83mvazkmk1.fsf@gnu.org> <83k262lj2j.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 1493580996 12077 195.159.176.226 (30 Apr 2017 19:36:36 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 30 Apr 2017 19:36:36 +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 21:36:32 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 1d4udz-00031t-Q7 for ged-emacs-devel@m.gmane.org; Sun, 30 Apr 2017 21:36:31 +0200 Original-Received: from localhost ([::1]:45714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4ue5-0002fR-LW for ged-emacs-devel@m.gmane.org; Sun, 30 Apr 2017 15:36:37 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4udS-0002eG-Ga for emacs-devel@gnu.org; Sun, 30 Apr 2017 15:35:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4udR-00013c-QG for emacs-devel@gnu.org; Sun, 30 Apr 2017 15:35:58 -0400 Original-Received: from mail-io0-x232.google.com ([2607:f8b0:4001:c06::232]:36007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4udQ-00012b-JI; Sun, 30 Apr 2017 15:35:56 -0400 Original-Received: by mail-io0-x232.google.com with SMTP id p80so97453031iop.3; Sun, 30 Apr 2017 12:35:56 -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=WGdOZf3QSQ9TX2pf9WAo+jKV02V71KDxdNro7GCANA0=; b=Bc4G7aBSuqH9d2DZIRB+BSPZUs2JvPFnBRljy5LKveuOtCpeJsiXqjTDYbYPk/mdfz APouwIa3n41p7G1ocqOOKFCUmlIP+XwgAUhAuYhHyDZ/+DmVQ56kfvaBqDFbroiXf8KP Sz0NKtnZEhfc/F9RORiW3lP/UtKiklbw5GUGiN0fFrxEGDV67LF0XFG9p2Ml/8biR6Ae zMOl3yq+3R5FCpxBb1coIwQk3iJ6DOTESJdmct1Y4ouxg7X74iJrGV6YCNGHFcpXiofu LltpkswR+5Oat1t4b8m4G3vOksMApH3qsVzU14alrT7iO1NPMOVuaCzlYsQKh6Klowur rERg== 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=WGdOZf3QSQ9TX2pf9WAo+jKV02V71KDxdNro7GCANA0=; b=ukX8IX9C1QGi27BWb2RdQFmMoiDyWjOqXVMRS5vVTnClU6+rBc6+hWrdfGl3rNbl8E 112oyd0avvA+Bf+qlexYhSTlNCtqLX/YSz/VW8wzCj22ngOAOZStzy4PT2TLSXlq3hMo re0hvt3pGKKZnYDkpJVMuJJPpK8TqAyyareQy+tCLnVRJ4ZOq8+kALUsgfoTrDvYb5Bq vXbUQ23krG54xwVrj87ZMHvSYZS1USsU6UYvzzHbr5i7uLc2IWbWfFVNYMjjjSsBggbY SrY1mhM+UMNKiU1wo5GZCjTz6516ZRsuWZ10GaoLFt3mMquV5oyigTrYPSFyrUH8B/um H8ZQ== X-Gm-Message-State: AN3rC/4bCKvPe4oSAdS6nWfUe5XzcQ48rLQ8JI9qYnD4DFQufeZjWR88 IyfgYwLoOM1nxJlYbYav4sjxGzmb3w== X-Received: by 10.202.98.130 with SMTP id w124mr6105377oib.133.1493580955754; Sun, 30 Apr 2017 12:35:55 -0700 (PDT) Original-Received: by 10.157.25.10 with HTTP; Sun, 30 Apr 2017 12:35:55 -0700 (PDT) In-Reply-To: <83k262lj2j.fsf@gnu.org> X-Google-Sender-Auth: S6fLVBGOfmiuSaM-MdlSmJ0MMCU X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001: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:214450 Archived-At: On Sat, Apr 29, 2017 at 10:34 PM, Eli Zaretskii wrote: > > I mean that users will be surprised to see the hooks invoked when > cherry-picking. I know I was surprised to see the git-merge-changelog > utility to be invoked the first time I cherry-picked. I don't see where git-merge-changelog is being called from the hooks. With respect to the pre-commit hook, it seems that we can't play the same trick as with 'git merge', because CHERRY_PICK_HEAD doesn't exist when picking only one commit.