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

Re: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 4, 2020, 13:22 UTC
Message-ID
<nycvar.QRO.7.76.6.2011041422120.18437@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqv9ensao7.fsf@gitster.c.googlers.com>
Hi Junio,
On Mon, 2 Nov 2020, Junio C Hamano wrote:
Show 36 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Tue, 27 Oct 2020, Junio C Hamano wrote:
> >
> >> * ag/merge-strategies-in-c (2020-10-06) 11 commits
> >>  - sequencer: use the "octopus" merge strategy without forking
> >>  - sequencer: use the "resolve" strategy without forking
> >>  - merge: use the "octopus" strategy without forking
> >>  - merge: use the "resolve" strategy without forking
> >>  - merge-octopus: rewrite in C
> >>  - merge-recursive: move better_branch_name() to merge.c
> >>  - merge-resolve: rewrite in C
> >>  - merge-index: don't fork if the requested program is `git-merge-one-file'
> >>  - merge-index: libify merge_one_path() and merge_all()
> >>  - merge-one-file: rewrite in C
> >>  - t6027: modernise tests
> >>
> >>  The resolve and octopus merge strategy backends have been rewritten
> >>  in C.
> >
> > From where I sit, this is ready for `next`.
>
> I just went back to the thread.
>
> https://lore.kernel.org/git/20201005122646.27994-1-alban.gruin@gmail.com/
>
> It seems that the topic saw quite a few comments and help by Phillip
> Wood in its earliest iteration, but I didn't see any review from
> those other than myself on the last iteration v3, and the review
> comments on the iteration haven't been acted upon yet.
>
> That was why I threw the topic in "needs review" bucket.  The later
> half of the series got no comments (I lost steam after reviewing the
> earlier half) and I suspect they would have be adjusted for fixes
> and improvements done to polish the earlier parts, so I am not sure
> where your "ready for 'next'" comes from.

Sorry, I had missed your latest suggestion had not been addressed yet. Maybe I am a bit over-eager to get rid of those scripts...

Ciao, Dscho

Previous: Junio C Hamano
Message 14 of 14 in “What's cooking in git.git (Oct 2020, #04; Tue, 27)”
  1. Junio C HamanoOct 27, 2020
  2. jc/sequencer-stopped-sha-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)Johannes Schindelin, Nov 2, 2020
  3. Junio C HamanoNov 2, 2020
  4. Jonathan TanNov 2, 2020
  5. Junio C HamanoNov 2, 2020
  6. jk/committer-date-is-author-date-fix-simplify, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)Johannes Schindelin, Nov 2, 2020
  7. Junio C HamanoNov 2, 2020
  8. sj/untracked-files-in-submodule-directory-is-not-dirty, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)Johannes Schindelin, Nov 2, 2020
  9. Junio C HamanoNov 3, 2020
  10. ag/merge-strategies-in-c, was Re: What's cooking in git.git (Oct 2020, #04; Tue, 27)Johannes Schindelin, Nov 2, 2020
  11. Junio C HamanoNov 2, 2020
  12. Alban GruinNov 2, 2020
  13. Junio C HamanoNov 3, 2020
  14. Johannes SchindelinNov 4, 2020

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.