From: Josh England Date: Tue, 04 Sep 2007 21:23:49 GMT Subject: Re: [PATCH] Add post-merge hook. Message-ID: <1188941029.6192.73.camel@beauty> 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