From: Colin Stagner <ask+git@howdoi•land>
To: "D. Ben Knoble" <ben.knoble@gmail•com>,
Zach FettersMoore <zach.fetters@apollographql•com>,
Christian Heusel <christian@heusel•eu>,
george@mail•dietrich.pub, Christian Hesse <list@eworm•de>,
Phillip Wood <phillip.wood@dunelm•org.uk>,
git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>, Colin Stagner <ask+git@howdoi•land>
Subject: [PATCH v2 0/3] contrib/subtree: process out-of-prefix subtrees
Date: Tue, 17 Feb 2026 20:31:29 -0600 [thread overview]
Message-ID: <20260217-cs-subtree-remove-optimization-v2-0-4299e71a30c6@howdoi.land> (raw)
In-Reply-To: <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.
Signed-off-by: Colin Stagner <ask+git@howdoi•land>
---
Changes in v2:
- remove incorrect newlines from commit message trailers
- patch diffs are unchanged
---
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
change-id: 20260217-cs-subtree-remove-optimization-aca442f748eb
Best regards,
--
Colin Stagner <ask+git@howdoi•land>
next prev parent reply other threads:[~2026-02-18 2:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-15 20:18 [PATCH 0/3] contrib/subtree: process out-of-prefix subtrees Colin Stagner
2026-02-15 20:18 ` [PATCH 1/3] contrib/subtree: capture additional test-cases Colin Stagner
2026-02-15 20:18 ` [PATCH 2/3] contrib/subtree: test history depth Colin Stagner
2026-02-15 20:18 ` [PATCH 3/3] contrib/subtree: process out-of-prefix subtrees Colin Stagner
2026-02-16 21:33 ` D. Ben Knoble
2026-02-18 2:25 ` Colin Stagner
2026-02-18 2:31 ` Colin Stagner [this message]
2026-02-18 2:31 ` [PATCH v2 1/3] contrib/subtree: capture additional test-cases Colin Stagner
2026-02-18 2:31 ` [PATCH v2 2/3] contrib/subtree: test history depth Colin Stagner
2026-02-18 2:31 ` [PATCH v2 3/3] contrib/subtree: process out-of-prefix subtrees Colin Stagner
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=20260217-cs-subtree-remove-optimization-v2-0-4299e71a30c6@howdoi.land \
--to=ask+git@howdoi$(echo .)land \
--cc=ben.knoble@gmail$(echo .)com \
--cc=christian@heusel$(echo .)eu \
--cc=george@mail$(echo .)dietrich.pub \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=list@eworm$(echo .)de \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=zach.fetters@apollographql$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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