From: Phillip Wood <phillip.wood123@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org, Alban Gruin <alban.gruin@gmail.com>,
Taylor Blau <me@ttaylorr.com>
Subject: Re: ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))
Date: Thu, 15 Dec 2022 12:55:34 +0000 [thread overview]
Message-ID: <c9c2c979-82b3-8be1-1edb-343661cf4b32@dunelm.org.uk> (raw)
In-Reply-To: <221215.865yed3tzv.gmgdl@evledraar.gmail.com>
On 15/12/2022 09:14, Ævar Arnfjörð Bjarmason wrote:
>
> On Wed, Dec 14 2022, Junio C Hamano wrote:
>
>> * 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...
I think splitting this in two is a good idea as there were only a couple
of outstanding issues with the first half of Alban's V8. When you posted
V9 I looked at the range-diff hoping to see a couple of localized
changes addressing those issues. Instead it looks like you've rewritten
most of the patches that people have already spent a considerable time
reviewing. I don't think it is a good use of reviewers' time to
essentially start reviewing again from scratch.
Best Wishes
Phillip
next prev parent reply other threads:[~2022-12-15 12:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 9:59 What's cooking in git.git (Dec 2022, #05; Wed, 14) Junio C Hamano
2022-12-14 10:44 ` Junio C Hamano
2022-12-14 19:46 ` Taylor Blau
2022-12-14 15:09 ` Derrick Stolee
2022-12-14 23:50 ` Junio C Hamano
2022-12-14 19:09 ` Jeff Hostetler
2022-12-14 23:50 ` Junio C Hamano
2022-12-14 19:18 ` Jeff Hostetler
2022-12-15 22:37 ` Junio C Hamano
2022-12-15 9:14 ` ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14)) Ævar Arnfjörð Bjarmason
2022-12-15 12:55 ` Phillip Wood [this message]
2022-12-15 15:32 ` Ævar Arnfjörð Bjarmason
2022-12-15 16:27 ` Phillip Wood
2022-12-15 16:29 ` Ævar Arnfjörð Bjarmason
2022-12-15 9:33 ` ab/remove--super-prefix & ab/submodule-no-abspath " Ævar Arnfjörð Bjarmason
2022-12-15 9:49 ` js/bisect-in-c " Ævar Arnfjörð Bjarmason
2022-12-15 11:55 ` What's cooking in git.git (Dec 2022, #05; Wed, 14) Sean Allred
2022-12-15 22:45 ` Junio C Hamano
2022-12-15 23:09 ` Junio C Hamano
2022-12-16 15:33 ` ds/bundle-uri-4* (was Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)) Derrick Stolee
2022-12-16 22:55 ` 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=c9c2c979-82b3-8be1-1edb-343661cf4b32@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=alban.gruin@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
/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).