All of lore.kernel.org
 help / color / mirror / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Cc: "Derrick Stolee" <dstolee@microsoft.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Taylor Blau" <me@ttaylorr.com>,
	"Jonathan Tan" <jonathantanmy@google.com>,
	"Jeff King" <peff@peff.net>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Elijah Newren" <newren@gmail.com>
Subject: Re: [PATCH 0/2] Declare merge-ort ready for general usage
Date: Tue, 16 Mar 2021 13:01:50 -0400	[thread overview]
Message-ID: <44487d2a-f591-7e0f-8532-41397ec805c9@gmail.com> (raw)
In-Reply-To: <pull.905.git.1615867503.gitgitgadget@gmail.com>

On 3/16/2021 12:05 AM, Elijah Newren via GitGitGadget wrote:
> This tiny series depends on ort-perf-batch-10[1].
> 
> If the ort-remainder topic[2] is merged with this series, then the result is
> a version of merge-ort ready for general usage. Users can select it by (a)
> passing -sort to either git merge or git rebase, or (b) by setting
> pull.twohead=ort [3], or (c) by setting GIT_TEST_MERGE_ALGORITHM=ort.

Does the other topic add GIT_TEST_MERGE_ALGORITHM=ort to the CI builds?

Specifically, the Linux builds have a second run with some optional
GIT_TEST_* environment variables. This seems like a nice addition.
 Other than that extra request, this series was easy to review. LGTM.
-Stolee

  parent reply	other threads:[~2021-03-16 17:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16  4:05 [PATCH 0/2] Declare merge-ort ready for general usage Elijah Newren via GitGitGadget
2021-03-16  4:05 ` [PATCH 1/2] Revert "merge-ort: ignore the directory rename split conflict for now" Elijah Newren via GitGitGadget
2021-03-16  4:05 ` [PATCH 2/2] t6423: mark remaining expected failure under merge-ort as such Elijah Newren via GitGitGadget
2021-03-16 17:01 ` Derrick Stolee [this message]
2021-03-16 17:25   ` [PATCH 0/2] Declare merge-ort ready for general usage Elijah Newren
2021-03-16 17:33     ` Derrick Stolee
2021-03-17 21:27 ` [PATCH v2 00/13] " Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 01/13] merge-ort: use STABLE_QSORT instead of QSORT where required Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 02/13] merge-ort: add a special minimal index just for renormalization Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 03/13] merge-ort: have ll_merge() use a special attr_index " Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 04/13] merge-ort: let renormalization change modify/delete into clean delete Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 05/13] merge-ort: support subtree shifting Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 06/13] t6428: new test for SKIP_WORKTREE handling and conflicts Elijah Newren via GitGitGadget
2021-03-17 21:27   ` [PATCH v2 07/13] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 08/13] t: mark several submodule merging tests as fixed under merge-ort Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 09/13] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 10/13] merge-recursive: add a bunch of FIXME comments documenting known bugs Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 11/13] Revert "merge-ort: ignore the directory rename split conflict for now" Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 12/13] t6423: mark remaining expected failure under merge-ort as such Elijah Newren via GitGitGadget
2021-03-17 21:28   ` [PATCH v2 13/13] Add testing with merge-ort merge strategy Elijah Newren via GitGitGadget
2021-03-19 13:05     ` Derrick Stolee
2021-03-19 15:21       ` Elijah Newren
2021-03-19 13:09   ` [PATCH v2 00/13] Declare merge-ort ready for general usage Derrick Stolee
2021-03-19 23:21     ` Elijah Newren
2021-03-19 23:35     ` Elijah Newren
2021-03-20  0:03   ` [PATCH v3 " Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 01/13] merge-ort: use STABLE_QSORT instead of QSORT where required Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 02/13] merge-ort: add a special minimal index just for renormalization Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 03/13] merge-ort: have ll_merge() use a special attr_index " Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 04/13] merge-ort: let renormalization change modify/delete into clean delete Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 05/13] merge-ort: support subtree shifting Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 06/13] t6428: new test for SKIP_WORKTREE handling and conflicts Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 07/13] merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 08/13] t: mark several submodule merging tests as fixed under merge-ort Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 09/13] merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 10/13] merge-recursive: add a bunch of FIXME comments documenting known bugs Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 11/13] Revert "merge-ort: ignore the directory rename split conflict for now" Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 12/13] t6423: mark remaining expected failure under merge-ort as such Elijah Newren via GitGitGadget
2021-03-20  0:03     ` [PATCH v3 13/13] Add testing with merge-ort merge strategy Elijah Newren via GitGitGadget
2021-03-20  1:49     ` [PATCH v3 00/13] Declare merge-ort ready for general usage Derrick Stolee

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

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

  git send-email \
    --in-reply-to=44487d2a-f591-7e0f-8532-41397ec805c9@gmail.com \
    --to=stolee@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=jonathantanmy@google.com \
    --cc=jrnieder@gmail.com \
    --cc=me@ttaylorr.com \
    --cc=newren@gmail.com \
    --cc=peff@peff.net \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.