From: Alban Gruin <alban.gruin@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)]
Date: Sun, 22 Nov 2020 13:43:38 +0100
Message-ID: <8c92f1d0-3f17-d8b2-ca93-c70ee887f37d@gmail.com> (raw)
In-Reply-To: <xmqqwnyeqpw9.fsf@gitster.c.googlers.com>
Hi Junio,
Le 21/11/2020 à 23:57, Junio C Hamano a écrit :
> * ag/merge-strategies-in-c (2020-11-16) 12 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
> - update-index: move add_cacheinfo() to read-cache.c
> - t6027: modernise tests
>
> The resolve and octopus merge strategy backends have been rewritten
> in C.
>
There is some behaviour changes and regressions in this iteration that I
intend to fix. Expect a reroll soon.
I also noticed that I can show which branch has made a branch when there
is a conflict with the "resolve" strategy, like "recursive" already
does. Should this change be part of this series, or should it be a
separate patch?
Cheers,
Alban
next prev parent reply other threads:[~2020-11-22 12:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-21 22:57 What's cooking in git.git (Nov 2020, #04; Thu, 19) Junio C Hamano
2020-11-22 11:02 ` René Scharfe
2020-11-22 12:43 ` Alban Gruin [this message]
2020-11-23 19:15 ` ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)] 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
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=8c92f1d0-3f17-d8b2-ca93-c70ee887f37d@gmail.com \
--to=alban.gruin@gmail.com \
--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
git@vger.kernel.org list mirror (unofficial, one of many)
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://public-inbox.org/git
git clone --mirror http://ou63pmih66umazou.onion/git
git clone --mirror http://czquwvybam4bgbro.onion/git
git clone --mirror http://hjrcffqmbrq6wope.onion/git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V1 git git/ https://public-inbox.org/git \
git@vger.kernel.org
public-inbox-index git
Example config snippet for mirrors.
Newsgroups are available over NNTP:
nntp://news.public-inbox.org/inbox.comp.version-control.git
nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
nntp://news.gmane.io/gmane.comp.version-control.git
note: .onion URLs require Tor: https://www.torproject.org/
code repositories for the project(s) associated with this inbox:
https://80x24.org/mirrors/git.git
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git