From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: 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: [PATCH 0/2] Declare merge-ort ready for general usage
Date: Tue, 16 Mar 2021 04:05:00 +0000 [thread overview]
Message-ID: <pull.905.git.1615867503.gitgitgadget@gmail.com> (raw)
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.
There are still more optimizations that will be submitted for merge-ort, but
folks don't need to wait for all of them to start using it. The version of
merge-ort that comes from merging both these topics will run the testsuite
cleanly under GIT_MERGE_TEST_ALGORITHM=ort, which includes passing every
test that merge-recursive does and passing dozens of tests that
merge-recursive doesn't. merge-ort is also already significantly faster than
merge-recursive when rename detection is involved.
I'll send out a separate email later requesting feedback about what people
would like to see before switching the default from merge-recursive to
merge-ort.
[1]
https://lore.kernel.org/git/pull.853.git.1615674128.gitgitgadget@gmail.com/
[2]
https://lore.kernel.org/git/pull.973.v2.git.git.1615271086.gitgitgadget@gmail.com/
[3] See commit 14c4586c2d ("merge,rebase,revert: select ort or recursive by
config or environment", 2020-11-02)
Elijah Newren (2):
Revert "merge-ort: ignore the directory rename split conflict for now"
t6423: mark remaining expected failure under merge-ort as such
merge-ort.c | 13 +------------
t/t6423-merge-rename-directories.sh | 2 +-
2 files changed, 2 insertions(+), 13 deletions(-)
base-commit: ac0ba91ce275227f5df8f16fb986308ff88b198b
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-905%2Fgitgitgadget%2Fort-readiness-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-905/gitgitgadget/ort-readiness-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/905
--
gitgitgadget
next reply other threads:[~2021-03-16 4:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 4:05 Elijah Newren via GitGitGadget [this message]
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 ` [PATCH 0/2] Declare merge-ort ready for general usage Derrick Stolee
2021-03-16 17:25 ` 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=pull.905.git.1615867503.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--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 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 NNTP newsgroup(s).