From: Derrick Stolee <stolee@gmail.com>
To: Elijah Newren <newren@gmail.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH v2 0/6] Sparse Index: Integrate with merge, cherry-pick, rebase, and revert
Date: Mon, 30 Aug 2021 13:26:46 -0400 [thread overview]
Message-ID: <cac6803c-b66b-e3b5-b31f-e20695c8b5e6@gmail.com> (raw)
In-Reply-To: <CABPp-BFXk++dktLnaTTuCe+keqkNuPzGyVi4uFsOpE4VxqAUdw@mail.gmail.com>
On 8/27/2021 6:56 PM, Elijah Newren wrote:
> On Tue, Aug 24, 2021 at 2:52 PM Derrick Stolee via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
...
>> Updates in V2
>> =============
>>
>> * The tests no longer specify GIT_TEST_MERGE_ALGORITHM or directly
>> reference "-s ort". By relaxing this condition, I found an issue with
>> 'git cherry-pick' and 'git rebase' when using the 'recursive' algorithm
>> which is fixed in a new patch.
This describes why the tests no longer use GIT_TEST_MERGE_ALGORITHM at
the top. It improves coverage in case users opt-out of ORT. Instead,
>> * Use the pul.twohead config to specify the ORT merge algorithm to avoid
>> expanding the sparse index when that is what we are testing.
>
> pull.twohead, not pul.twohead.
We use this config option to specify when we _really care_ about the ORT
strategy as it is necessary to avoid expanding the full index.
> I'm curious, though, why use it instead of just setting
> GIT_TEST_MERGE_ALGORITHM=ort? That'd seem to avoid the need for the
> explicit subshells and the sane_unset calls.
>
>>
>> * Corrected some misstatements in my commit messages.
>
> I read over v2. Other than some minor questions about whether using
> GIT_TEST_MERGE_ALGORITHM=ort would be easier, and a typo still present
> from v1, the series looks good to me.
Sorry about the typo, as I fixed it in Patch 3 but not Patch 2. I will
fix these in v3 after I send a v5 of the ignored files series.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-08-30 17:27 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 17:08 [PATCH 0/6] Sparse Index: Integrate with merge, cherry-pick, rebase, and revert Derrick Stolee via GitGitGadget
2021-08-17 17:08 ` [PATCH 1/6] t1092: use ORT merge strategy Derrick Stolee via GitGitGadget
2021-08-18 17:16 ` Taylor Blau
2021-08-18 18:10 ` Junio C Hamano
2021-08-18 18:42 ` Derrick Stolee
2021-08-18 22:22 ` Junio C Hamano
2021-08-20 21:23 ` Elijah Newren
2021-08-20 23:32 ` Junio C Hamano
2021-08-21 0:20 ` Elijah Newren
2021-08-21 4:20 ` Junio C Hamano
2021-08-21 23:48 ` Elijah Newren
2021-08-17 17:08 ` [PATCH 2/6] diff: ignore sparse paths in diffstat Derrick Stolee via GitGitGadget
2021-08-20 21:32 ` Elijah Newren
2021-08-24 18:30 ` Derrick Stolee
2021-08-27 22:27 ` Elijah Newren
2021-08-17 17:08 ` [PATCH 3/6] merge: make sparse-aware with ORT Derrick Stolee via GitGitGadget
2021-08-20 21:40 ` Elijah Newren
2021-08-17 17:08 ` [PATCH 4/6] merge-ort: expand only for out-of-cone conflicts Derrick Stolee via GitGitGadget
2021-08-20 21:53 ` Elijah Newren
2021-08-17 17:08 ` [PATCH 5/6] t1092: add cherry-pick, rebase tests Derrick Stolee via GitGitGadget
2021-08-20 21:58 ` Elijah Newren
2021-08-17 17:08 ` [PATCH 6/6] sparse-index: integrate with cherry-pick and rebase Derrick Stolee via GitGitGadget
2021-08-21 0:12 ` Elijah Newren
2021-08-24 21:52 ` [PATCH v2 0/6] Sparse Index: Integrate with merge, cherry-pick, rebase, and revert Derrick Stolee via GitGitGadget
2021-08-24 21:52 ` [PATCH v2 1/6] diff: ignore sparse paths in diffstat Derrick Stolee via GitGitGadget
2021-08-24 21:52 ` [PATCH v2 2/6] merge: make sparse-aware with ORT Derrick Stolee via GitGitGadget
2021-08-27 22:43 ` Elijah Newren
2021-08-30 17:18 ` Derrick Stolee
2021-09-08 1:49 ` Derrick Stolee
2021-08-24 21:52 ` [PATCH v2 3/6] merge-ort: expand only for out-of-cone conflicts Derrick Stolee via GitGitGadget
2021-08-27 22:47 ` Elijah Newren
2021-08-30 17:21 ` Derrick Stolee
2021-08-24 21:52 ` [PATCH v2 4/6] t1092: add cherry-pick, rebase tests Derrick Stolee via GitGitGadget
2021-08-24 21:52 ` [PATCH v2 5/6] sequencer: ensure full index if not ORT strategy Derrick Stolee via GitGitGadget
2021-08-24 21:52 ` [PATCH v2 6/6] sparse-index: integrate with cherry-pick and rebase Derrick Stolee via GitGitGadget
2021-08-27 22:56 ` [PATCH v2 0/6] Sparse Index: Integrate with merge, cherry-pick, rebase, and revert Elijah Newren
2021-08-30 17:26 ` Derrick Stolee [this message]
2021-09-08 11:23 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2021-09-08 11:23 ` [PATCH v3 1/6] diff: ignore sparse paths in diffstat Derrick Stolee via GitGitGadget
2021-09-08 11:23 ` [PATCH v3 2/6] merge: make sparse-aware with ORT Derrick Stolee via GitGitGadget
2021-09-08 11:23 ` [PATCH v3 3/6] merge-ort: expand only for out-of-cone conflicts Derrick Stolee via GitGitGadget
2021-09-08 11:23 ` [PATCH v3 4/6] t1092: add cherry-pick, rebase tests Derrick Stolee via GitGitGadget
2021-09-08 11:24 ` [PATCH v3 5/6] sequencer: ensure full index if not ORT strategy Derrick Stolee via GitGitGadget
2021-09-08 11:24 ` [PATCH v3 6/6] sparse-index: integrate with cherry-pick and rebase Derrick Stolee via GitGitGadget
2021-09-09 14:16 ` [PATCH v3 0/6] Sparse Index: Integrate with merge, cherry-pick, rebase, and revert Elijah Newren
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=cac6803c-b66b-e3b5-b31f-e20695c8b5e6@gmail.com \
--to=stolee@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.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).