git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / 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 (Oct 2020, #04; Tue, 27)
Date: Mon, 2 Nov 2020 03:37:58 +0100 (CET)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.2011020333440.18437@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqmu079rbv.fsf@gitster.c.googlers.com>

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

Hi Junio,

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`.

Ciao,
Dscho

P.S.: I recently mused about the `pu -> seen` rename, and how the rest of
the integration branches' names could be renamed, too. It did strike me as
somewhat unfortunate that `master` is not called `next`, because it
essentially hosts the changes lined up for the next version. And what is
currently `next` could become `cooking` instead. Or `kitchen`. Or
`cauldron`. And in my musing's universe, there would not be any `maint`
branch, only `maint-<version>` branches à la `maint-2.29`...

  parent reply	other threads:[~2020-11-02 13:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-27 23:33 What's cooking in git.git (Oct 2020, #04; Tue, 27) Junio C Hamano
2020-11-02  1:47 ` jc/sequencer-stopped-sha-simplify, was " Johannes Schindelin
2020-11-02 18:34   ` Junio C Hamano
2020-11-02 18:46     ` Jonathan Tan
2020-11-02 18:51       ` Junio C Hamano
2020-11-02  1:50 ` jk/committer-date-is-author-date-fix-simplify, " Johannes Schindelin
2020-11-02 18:57   ` Junio C Hamano
2020-11-02  1:58 ` sj/untracked-files-in-submodule-directory-is-not-dirty, " Johannes Schindelin
2020-11-03  1:01   ` Junio C Hamano
2020-11-02  2:37 ` Johannes Schindelin [this message]
2020-11-02 21:36   ` ag/merge-strategies-in-c, " Junio C Hamano
2020-11-02 22:31     ` Alban Gruin
2020-11-03  0:32       ` Junio C Hamano
2020-11-04 13:22     ` Johannes Schindelin

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

  List information: http://vger.kernel.org/majordomo-info.html

* 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.2011020333440.18437@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).