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

[PATCH 0/3] contrib/subtree: process out-of-prefix subtrees

From
CSColin Stagner <ask+git@howdoi.land>
Date
Feb 15, 2026, 20:18 UTC
Message-ID
<20260215201906.889951-1-ask+git@howdoi.land>
* cs/subtree-remove-optimization:
  Remove an optimization that can exclude too much
  history during a "subtree split."

Remove an optimization introduced in 98ba49ccc2 (subtree: fix split processing with multiple subtrees present, 2023-12-01). The optimization incorrectly excludes commits from the split history that must be included.

The above commit, and my later attempt to fix it in 83f9dad7d6 (contrib/subtree: fix split with squashed subtrees, 2025-09-09), both introduce known regressions.

Improve test coverage for `copy_or_skip`, which will help detect future regressions.

Colin Stagner (3):
  contrib/subtree: capture additional test-cases
  contrib/subtree: test history depth
  contrib/subtree: process out-of-prefix subtrees
 contrib/subtree/git-subtree.sh     |  50 +-------
 contrib/subtree/t/t7900-subtree.sh | 198 +++++++++++++++++++++++++++--
 2 files changed, 190 insertions(+), 58 deletions(-)
base-commit: 852829b3dd2fe4e7c7fc4d8badde644cf1b66c74
-- 
2.43.0
Next: Colin Stagner
Message 1 of 6 in “contrib/subtree: process out-of-prefix subtrees”
  1. 0/3 contrib/subtree: process out-of-prefix subtreesColin Stagner, Feb 15, 2026
  2. 1/3 contrib/subtree: capture additional test-casesColin Stagner, Feb 15, 2026
  3. 3/3 contrib/subtree: process out-of-prefix subtreesColin Stagner, Feb 15, 2026
  4. D. Ben KnobleFeb 16, 2026
  5. Colin StagnerFeb 18, 2026
  6. 2/3 contrib/subtree: test history depthColin Stagner, Feb 15, 2026

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.