git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jay Soffian <jaysoffian@gmail.com>
To: Liam Clarke <liam.clarke-hutchinson@adscale.co.nz>
Cc: git@vger.kernel.org
Subject: Re: git merge auto-commit doesn't fire pre-commit hook
Date: Wed, 16 Feb 2011 23:36:09 -0500	[thread overview]
Message-ID: <AANLkTimCdQL879kBZiktB49eSvoAGT0pX5DKX0SHFOVB@mail.gmail.com> (raw)
In-Reply-To: <1F3B7FF9-6348-4197-A6B7-23C4DA144920@adscale.co.nz>

On Wed, Feb 16, 2011 at 5:49 PM, Liam Clarke
<liam.clarke-hutchinson@adscale.co.nz> wrote:
> How exactly does git merge execute the commit?

Merge calls commit_tree directly, so the standard commit hooks are bypassed.

>  Does it use --no-verify at all? I've got a pre-commit hook to filter out testing data when merging into master, and if you merge with --no-commit, and then manually commit, the hook fires fine, but when merge autocommits, the hook doesn't get executed at all. Is there any other way to catch this event? I can add --no-commit to the branch.master.mergeoptions I suppose, but I don't want to add too much hassle for our Git users (if they're not checking in test data, of course).

I recently fixed this for prepare-commit-msg since that was the one I
cared about. See
http://thread.gmane.org/gmane.comp.version-control.git/151297 and
http://thread.gmane.org/gmane.comp.version-control.git/166805

j.

  reply	other threads:[~2011-02-17  4:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-16 22:49 git merge auto-commit doesn't fire pre-commit hook Liam Clarke
2011-02-17  4:36 ` Jay Soffian [this message]
2011-02-17  4:44   ` Liam Clarke
2011-02-17  4:48     ` Jay Soffian
2011-02-17  4:52     ` Jay Soffian
2011-02-17  5:05       ` Liam Clarke

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=AANLkTimCdQL879kBZiktB49eSvoAGT0pX5DKX0SHFOVB@mail.gmail.com \
    --to=jaysoffian@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=liam.clarke-hutchinson@adscale.co.nz \
    /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).