From: Eli Zaretskii <eliz@gnu.org>
To: Noam Postavsky <npostavs@users.sourceforge.net>
Cc: rudalics@gmx.at, yuri.v.khan@gmail.com, eggert@cs.ucla.edu,
schwab@suse.de, emacs-devel@gnu.org
Subject: Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)
Date: Sun, 30 Apr 2017 05:34:28 +0300 [thread overview]
Message-ID: <83k262lj2j.fsf@gnu.org> (raw)
In-Reply-To: <CAM-tV-9h_8=Yw+1cZ9JxW77PRGhLu=6P27SDKrO==zpuT7h49Q@mail.gmail.com> (message from Noam Postavsky on Sat, 29 Apr 2017 19:25:17 -0400)
> From: Noam Postavsky <npostavs@users.sourceforge.net>
> Date: Sat, 29 Apr 2017 19:25:17 -0400
> Cc: Paul Eggert <eggert@cs.ucla.edu>, martin rudalics <rudalics@gmx.at>,
> Emacs developers <emacs-devel@gnu.org>, Andreas Schwab <schwab@suse.de>, Yuri Khan <yuri.v.khan@gmail.com>
>
> On Sat, Apr 29, 2017 at 4:04 PM, Eli Zaretskii <eliz@gnu.org> 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?
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.
next prev parent reply other threads:[~2017-04-30 2:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 16:25 git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make) Noam Postavsky
2017-04-12 9:30 ` martin rudalics
2017-04-12 18:26 ` Paul Eggert
2017-04-13 0:13 ` Noam Postavsky
2017-04-13 1:49 ` Paul Eggert
2017-04-13 2:05 ` Noam Postavsky
2017-04-13 6:11 ` Paul Eggert
2017-04-13 20:04 ` Noam Postavsky
2017-04-29 18:00 ` Noam Postavsky
2017-04-29 18:44 ` Paul Eggert
2017-04-29 19:15 ` Eli Zaretskii
2017-04-29 19:54 ` Noam Postavsky
2017-04-29 20:04 ` Eli Zaretskii
2017-04-29 23:25 ` Noam Postavsky
2017-04-30 2:34 ` Eli Zaretskii [this message]
2017-04-30 19:35 ` Noam Postavsky
2017-04-30 19:40 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83k262lj2j.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=npostavs@users.sourceforge.net \
--cc=rudalics@gmx.at \
--cc=schwab@suse.de \
--cc=yuri.v.khan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.