dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-08 09:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-subtree: Bail out if we find output from Rust rewrite (test)

Browse Source 
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ian Jackson
2026-07-06 12:58:16 +01:00
committed by Junio C Hamano
parent cd6ad979ab
commit 20b117c1eb
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/subtree/t/t7900-subtree.sh
View File

@@ -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.
#