From: "Josh England" <jjengla@sandia.gov>
To: "Steven Grimm" <koreth@midwinter.com>
Cc: "Junio C Hamano" <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] Add post-merge hook.
Date: Tue, 04 Sep 2007 15:23:49 -0600 [thread overview]
Message-ID: <1188941029.6192.73.camel@beauty> (raw)
In-Reply-To: <46DDC576.3080708@midwinter.com>
On Tue, 2007-09-04 at 13:52 -0700, Steven Grimm wrote:
> Josh England wrote:
> > I'm thinking that it
> > will be sufficient to pass a flag indicating whether the working tree
> > has been modified or not. The flag can be set for normal merge and
> > fast-forward merges, and unset for up-to-dates and squash merges.
> >
> Squash merges modify the working tree. In fact, that's *all* they do --
> they don't commit anything.
OK. Looking at it closer, the post-merge hook should only run when
there has been a real merge (not run for up-to-dates), which seems
alright with me. With the immediate data at hand I could pass in a flag
indicating a squash merge or not, or could simply pass in the current
HEAD. I think the first scenario is more appropriate.
-JE
prev parent reply other threads:[~2007-09-04 21:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-30 22:40 [PATCH] Add post-merge hook jjengla
2007-08-30 23:07 ` Junio C Hamano
2007-09-04 16:25 ` Josh England
2007-09-04 17:25 ` Junio C Hamano
2007-09-04 19:36 ` Josh England
2007-09-04 20:03 ` Junio C Hamano
2007-09-04 20:32 ` Josh England
2007-09-04 20:52 ` Steven Grimm
2007-09-04 21:23 ` Josh England [this message]
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=1188941029.6192.73.camel@beauty \
--to=jjengla@sandia.gov \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=koreth@midwinter.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.
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 NNTP newsgroup(s).