git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: ag/merge-strategies-in-c, was Re: What's cooking in git.git (Mar 2021, #07; Mon, 22)
Date: Wed, 24 Mar 2021 11:43:57 +0100 (CET)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqq35wm5y6d.fsf@gitster.g>

Hi Junio,

On Mon, 22 Mar 2021, Junio C Hamano wrote:

> * ag/merge-strategies-in-c (2021-03-17) 15 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-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
>  - t6407: modernise tests
>
>  The resolve and octopus merge strategy backends have been rewritten
>  in C.
>
>  Ready?

I set aside some time to review this, and based on my suggestions, Alban
seems to be preparing one (final?) iteration. See e.g.
<b9d48a96-7e76-8a83-4ca2-c47fca326123@gmail.com>

Ciao,
Dscho

  reply	other threads:[~2021-03-24 12:32 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-23  3:47 What's cooking in git.git (Mar 2021, #07; Mon, 22) Junio C Hamano
2021-03-24 10:43 ` Johannes Schindelin [this message]
2021-03-24 17:13   ` ag/merge-strategies-in-c, was " Junio C Hamano
2021-03-28 13:50 ` Ævar Arnfjörð Bjarmason
2021-03-28 18:33   ` Junio C Hamano
2021-03-31  0:20   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).