From: Ian Jackson Date: Mon, 06 Jul 2026 11:58:16 GMT Subject: [PATCH 2/2] git-subtree: Bail out if we find output from Rust rewrite (test) Message-ID: <20260706115816.20267-3-ijackson@chiark.greenend.org.uk> In-Reply-To: <20260706115816.20267-1-ijackson@chiark.greenend.org.uk> Signed-off-by: Ian Jackson --- contrib/subtree/t/t7900-subtree.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 4194687cfb..e8fa640166 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -439,6 +439,24 @@ test_expect_success 'split sub dir/ with --rejoin' ' ) ' +test_expect_success 'split fail on RIIR git subtree data' ' + subtree_test_create_repo "$test_count" && + subtree_test_create_repo "$test_count/sub proj" && + test_create_commit "$test_count" main1 && + test_create_commit "$test_count/sub proj" sub1 && + ( + cd "$test_count" && + git fetch ./"sub proj" HEAD && + git subtree add --prefix="sub dir" FETCH_HEAD && + # simulate RIIR git-subtree generated data + mkdir .git-subtree && + echo "# sabotage" >.git-subtree/config && + git add .git-subtree/config && + git commit -m sabotage && + test_must_fail git subtree split -P "sub dir" HEAD + ) +' + # Tests that commits from other subtrees are not processed as # part of a split. # -- 2.47.3