git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Add post-merge hook.

From
JEJosh England <jjengla@sandia.gov>
Date
Sep 4, 2007, 21:23 UTC
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:
Show 8 quoted lines
> 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
Previous: Steven Grimm
Message 9 of 9 in “Add post-merge hook.”
  1. Add post-merge hook.jjengla@sandia.gov, Aug 30, 2007
  2. Junio C HamanoAug 30, 2007
  3. Josh EnglandSep 4, 2007
  4. Junio C HamanoSep 4, 2007
  5. Josh EnglandSep 4, 2007
  6. Junio C HamanoSep 4, 2007
  7. Josh EnglandSep 4, 2007
  8. Steven GrimmSep 4, 2007
  9. Josh EnglandSep 4, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.