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

Re: [PATCH 4/6] Restructure git-merge.sh

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 22, 2008, 12:50 UTC
Message-ID
<alpine.DEB.1.00.0805221348500.30431@racer>
In-Reply-To
<alpine.DEB.1.00.0805221147550.30431@racer>
Hi,
On Thu, 22 May 2008, Johannes Schindelin wrote:
Show 13 quoted lines
> On Wed, 21 May 2008, Junio C Hamano wrote:
> 
> > From: Sverre Hvammen Johansen <hvammen@gmail.com>
> > 
> > Restructure git-merge.sh for preparation of new feature:
> > 
> >        Head reduction before selecting merge strategy
> > 
> > Some aspects of this patch does not make much sense without
> > the next patch in this series.
> 
> As my student is pretty busy rewriting git-merge into a C builtin, can I 
> ask to hold this patch off?

Just to keep you updated: Miklos has a version of builtin-merge which passes all but three test scripts (in total, there are only 6 test cases that do not pass).

Given that the restructuring of git-merge.sh affects only the octopus case (IIRC...), I think it is not asked too much to redo the change in the builtin-merge, which should be easier, too.

Ciao, Dscho

Previous: Johannes Schindelin
Message 9 of 9 in “Forwarding Sverre's "merge --ff=<allow,only,never>" series”
  1. 0/6 Forwarding Sverre's "merge --ff=<allow,only,never>" seriesJunio C Hamano, May 22, 2008
  2. 1/6 Documentation for joining more than two historiesJunio C Hamano, May 22, 2008
  3. 2/6 New merge testsJunio C Hamano, May 22, 2008
  4. 3/6 Introduce -ff=<fast forward option>Junio C Hamano, May 22, 2008
  5. 4/6 Restructure git-merge.shJunio C Hamano, May 22, 2008
  6. 5/6 Head reduction before selecting merge strategyJunio C Hamano, May 22, 2008
  7. 6/6 Introduce fast forward option onlyJunio C Hamano, May 22, 2008
  8. Johannes SchindelinMay 22, 2008
  9. Johannes SchindelinMay 22, 2008

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.