From: Noam Postavsky <npostavs@users.sourceforge.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: martin rudalics <rudalics@gmx.at>,
Yuri Khan <yuri.v.khan@gmail.com>,
Paul Eggert <eggert@cs.ucla.edu>, Andreas Schwab <schwab@suse.de>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: git pre-commit hook for merges (WAS: master has switched from Automake to GNU Make)
Date: Sat, 29 Apr 2017 15:54:41 -0400 [thread overview]
Message-ID: <CAM-tV-8fQ0Px1VHSXnhg=UU0YxrbuDwv2tyX6rQahpewbbuYVw@mail.gmail.com> (raw)
In-Reply-To: <83shkrkote.fsf@gnu.org>
On Sat, Apr 29, 2017 at 3:15 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> > Since git only runs the hooks on the merged changes when you pass
>> > --no-commit to 'git merge', defaulting to non-blind merge doesn't
>> > really work anyway.
>>
>> Thanks for looking into this. I guess I'll have to rethink how I merge.
>
> Not sure it matters in the context of this discussion, but please keep
> in mind that "git cherry-pick" also merges.
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.
'git cherry-pick' does have the same issue as 'git merge': it won't
rerun the commit hook, unless '--no-commit' is passed (or something
else prevents the auto-commit, e.g., a conflict, or $EDITOR failing
due to lack of terminal).
next prev parent reply other threads:[~2017-04-29 19:54 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 [this message]
2017-04-29 20:04 ` Eli Zaretskii
2017-04-29 23:25 ` Noam Postavsky
2017-04-30 2:34 ` Eli Zaretskii
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='CAM-tV-8fQ0Px1VHSXnhg=UU0YxrbuDwv2tyX6rQahpewbbuYVw@mail.gmail.com' \
--to=npostavs@users.sourceforge.net \
--cc=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--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.