Code

Debug merge-recursive.[ch]#1898

Code

Closed

newren wants to merge 8 commits intogitgitgadget:mastergitgitgadget/git:masterfrom

newren:endit-quote-debugging-unquotenewren/git:endit-quote-debugging-unquoteCopy head branch name to clipboard

Commits

Commits on Mar 30, 2025

• checkout: replace merge_trees() with merge_ort_nonrecursive()

  Show description for 0e150ee
  newren

  committed
  0e150ee

  Copy full SHA for 0e150ee

Commits on Apr 1, 2025

• builtin/merge-recursive: switch to using merge_ort_generic()

  Show description for b093d74
  newren

  committed
  b093d74

  Copy full SHA for b093d74

• merge-ort: enable diff-algorithms other than histogram

  Show description for cf77443
  newren

  committed
  cf77443

  Copy full SHA for cf77443

• sequencer: switch non-recursive merges over to ort

  Show description for 6203589
  newren

  committed
  6203589

  Copy full SHA for 6203589

• merge, sequencer: switch recursive merges over to ort

  Show description for 8821f22
  newren

  committed
  8821f22

  Copy full SHA for 8821f22

Commits on Apr 8, 2025

• merge-recursive.[ch]: thoroughly debug these

  Show description for e696cb4
  newren

  committed
  e696cb4

  Copy full SHA for e696cb4

• tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

  Show description for 5dce909
  newren

  committed
  5dce909

  Copy full SHA for 5dce909

• builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

  Show description for bf2d462
  newren

  committed
  bf2d462

  Copy full SHA for bf2d462