mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Alban Gruin <>
To: Junio C Hamano <>,
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	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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?


  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:

  List information:

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

  git send-email \ \ \ \ \

* 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

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