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

ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Dec 15, 2022, 09:14 UTC
Message-ID
<221215.865yed3tzv.gmgdl@evledraar.gmail.com>
In-Reply-To
<xmqqiliewbje.fsf@gitster.g>
On Wed, Dec 14 2022, Junio C Hamano wrote:
Show 20 quoted lines
> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>  . sequencer: use the "octopus" 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-one-file: rewrite in C
>  . update-index: move add_cacheinfo() to read-cache.c
>  . merge-index: add a new way to invoke `git-merge-one-file'
>  . merge-index: drop the index
>  . merge-index: libify merge_one_path() and merge_all()
>  . t6060: add tests for removed files
>  . t6060: modify multiple files to expose a possible issue with merge-index
>
>  An attempt to rewrite remaining merge strategies from shell to C.
>
>  Tired of waiting for too long.
>  source: <20220809185429.20098-1-alban.gruin@gmail.com>

I submitted a v9 of this during Taylor's maintainership, but it fell between the cracks. I've submitted a rebased-on-master v10 now (there were some conflicts): https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/

It's just the "prep" patches, the real meaty part is converting the merge drivers, which will come after. Some of the performance numbers for those are really impressive...

Previous: Junio C HamanoNext: Phillip Wood
Message 10 of 21 in “What's cooking in git.git (Dec 2022, #05; Wed, 14)”
  1. Junio C HamanoDec 14, 2022
  2. Junio C HamanoDec 14, 2022
  3. Taylor BlauDec 14, 2022
  4. Derrick StoleeDec 14, 2022
  5. Junio C HamanoDec 14, 2022
  6. Jeff HostetlerDec 14, 2022
  7. Junio C HamanoDec 14, 2022
  8. Jeff HostetlerDec 14, 2022
  9. Junio C HamanoDec 15, 2022
  10. ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))Ævar Arnfjörð Bjarmason, Dec 15, 2022
  11. Phillip WoodDec 15, 2022
  12. Ævar Arnfjörð BjarmasonDec 15, 2022
  13. Phillip WoodDec 15, 2022
  14. Ævar Arnfjörð BjarmasonDec 15, 2022
  15. ab/remove--super-prefix & ab/submodule-no-abspath (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))Ævar Arnfjörð Bjarmason, Dec 15, 2022
  16. js/bisect-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))Ævar Arnfjörð Bjarmason, Dec 15, 2022
  17. Sean AllredDec 15, 2022
  18. Junio C HamanoDec 15, 2022
  19. Junio C HamanoDec 15, 2022
  20. ds/bundle-uri-4* (was Re: What's cooking in git.git (Dec 2022, #05; Wed, 14))Derrick Stolee, Dec 16, 2022
  21. Junio C HamanoDec 16, 2022

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.