git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/2] Declare merge-ort ready for general usage

From
Derrick Stolee <stolee@gmail.com>
Date
Mar 16, 2021, 17:01 UTC
Message-ID
<44487d2a-f591-7e0f-8532-41397ec805c9@gmail.com>
In-Reply-To
<pull.905.git.1615867503.gitgitgadget@gmail.com>
On 3/16/2021 12:05 AM, Elijah Newren via GitGitGadget wrote:
Show 6 quoted lines
> 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
Previous: Elijah Newren via GitGitGadgetNext: Elijah Newren
Message 4 of 40 in “Declare merge-ort ready for general usage”
  1. 0/2 Declare merge-ort ready for general usageElijah Newren via GitGitGadget, Mar 16, 2021
  2. 2/2 t6423: mark remaining expected failure under merge-ort as suchElijah Newren via GitGitGadget, Mar 16, 2021
  3. 1/2 Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren via GitGitGadget, Mar 16, 2021
  4. Derrick StoleeMar 16, 2021
  5. Elijah NewrenMar 16, 2021
  6. Derrick StoleeMar 16, 2021
  7. 00/13 Declare merge-ort ready for general usageElijah Newren via GitGitGadget, Mar 17, 2021
  8. 02/13 merge-ort: add a special minimal index just for renormalizationElijah Newren via GitGitGadget, Mar 17, 2021
  9. 05/13 merge-ort: support subtree shiftingElijah Newren via GitGitGadget, Mar 17, 2021
  10. 01/13 merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren via GitGitGadget, Mar 17, 2021
  11. 03/13 merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren via GitGitGadget, Mar 17, 2021
  12. 07/13 merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren via GitGitGadget, Mar 17, 2021
  13. 08/13 t: mark several submodule merging tests as fixed under merge-ortElijah Newren via GitGitGadget, Mar 17, 2021
  14. 06/13 t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren via GitGitGadget, Mar 17, 2021
  15. 04/13 merge-ort: let renormalization change modify/delete into clean deleteElijah Newren via GitGitGadget, Mar 17, 2021
  16. 10/13 merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren via GitGitGadget, Mar 17, 2021
  17. 09/13 merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren via GitGitGadget, Mar 17, 2021
  18. 11/13 Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren via GitGitGadget, Mar 17, 2021
  19. 12/13 t6423: mark remaining expected failure under merge-ort as suchElijah Newren via GitGitGadget, Mar 17, 2021
  20. 13/13 Add testing with merge-ort merge strategyElijah Newren via GitGitGadget, Mar 17, 2021
  21. Derrick StoleeMar 19, 2021
  22. Elijah NewrenMar 19, 2021
  23. Derrick StoleeMar 19, 2021
  24. Elijah NewrenMar 19, 2021
  25. Elijah NewrenMar 19, 2021
  26. 00/13 Declare merge-ort ready for general usageElijah Newren via GitGitGadget, Mar 20, 2021
  27. 03/13 merge-ort: have ll_merge() use a special attr_index for renormalizationElijah Newren via GitGitGadget, Mar 20, 2021
  28. 01/13 merge-ort: use STABLE_QSORT instead of QSORT where requiredElijah Newren via GitGitGadget, Mar 20, 2021
  29. 05/13 merge-ort: support subtree shiftingElijah Newren via GitGitGadget, Mar 20, 2021
  30. 02/13 merge-ort: add a special minimal index just for renormalizationElijah Newren via GitGitGadget, Mar 20, 2021
  31. 07/13 merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesElijah Newren via GitGitGadget, Mar 20, 2021
  32. 09/13 merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren via GitGitGadget, Mar 20, 2021
  33. 04/13 merge-ort: let renormalization change modify/delete into clean deleteElijah Newren via GitGitGadget, Mar 20, 2021
  34. 06/13 t6428: new test for SKIP_WORKTREE handling and conflictsElijah Newren via GitGitGadget, Mar 20, 2021
  35. 11/13 Revert "merge-ort: ignore the directory rename split conflict for now"Elijah Newren via GitGitGadget, Mar 20, 2021
  36. 08/13 t: mark several submodule merging tests as fixed under merge-ortElijah Newren via GitGitGadget, Mar 20, 2021
  37. 12/13 t6423: mark remaining expected failure under merge-ort as suchElijah Newren via GitGitGadget, Mar 20, 2021
  38. 13/13 Add testing with merge-ort merge strategyElijah Newren via GitGitGadget, Mar 20, 2021
  39. 10/13 merge-recursive: add a bunch of FIXME comments documenting known bugsElijah Newren via GitGitGadget, Mar 20, 2021
  40. Derrick StoleeMar 20, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.