From: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
To: Joseph Dunne <jdunne525@gmail.com>, Stefan Beller <sbeller@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: commit-msg hook does not run on merge with --no-ff option
Date: Fri, 15 Sep 2017 07:20:35 +0530 [thread overview]
Message-ID: <1505440235.1862.9.camel@gmail.com> (raw)
In-Reply-To: <CAC7pkbQwn8pvLLCtjsEkKo7PJozycdDbnq2XLWbmOm_KHEjU-w@mail.gmail.com>
On Tue, 2017-09-12 at 13:24 -0500, Joseph Dunne wrote:
> Sorry I don't understand your question. The commit-msg hook runs
> properly in all cases except when I perform a merge with the --no-ff
> option enabled.
>
It's working just as the documentation says it does (emphasis mine),
This hook is invoked by **git commit**, and can be bypassed with the --no-verify option.
It takes a single parameter, the name of the file that holds the proposed commit log
message. Exiting with a non-zero status causes the git commit to abort.
It says that 'commit-msg' hook is invoked only for a "commit" (it's not
a MERGE-msg hook you see, it doesn't exist anyway). In case you see the
hook getting invoked for a merge then that's an issue, I guess. For
what kind of merges do you see the 'commit-msg' hook getting invoked?
--
Kaartic
next prev parent reply other threads:[~2017-09-15 1:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 14:34 commit-msg hook does not run on merge with --no-ff option Joseph Dunne
2017-09-11 17:25 ` Stefan Beller
2017-09-12 18:24 ` Joseph Dunne
2017-09-15 1:50 ` Kaartic Sivaraam [this message]
2017-09-15 13:19 ` Joseph Dunne
2017-09-15 20:53 ` Junio C Hamano
2017-09-20 20:09 ` Joseph Dunne
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1505440235.1862.9.camel@gmail.com \
--to=kaarticsivaraam91196@gmail.com \
--cc=git@vger.kernel.org \
--cc=jdunne525@gmail.com \
--cc=sbeller@google.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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).