diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:24 -0800 |
| commit | 448a65c93b60ef7fe3c02e48e9bb5e5a31554c06 (patch) | |
| tree | e14e0aba4eee892916a017e7f69c1726ea2d4cd1 | |
| parent | b8524125239a2dd9bbc2bc87deda475f9cc3580e (diff) | |
| parent | 486386c687609603a2c1ebc434384d1e380908ae (diff) | |
| download | git-448a65c93b60ef7fe3c02e48e9bb5e5a31554c06.tar.xz | |
Merge branch 'cs/subtree-reftable-testfix'
Test fix (in contrib/)
* cs/subtree-reftable-testfix:
contrib/subtree: fix tests with reftable backend
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 316dc5269e..e7040718f2 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -1597,7 +1597,6 @@ test_expect_success 'push split to subproj' ' test_expect_success 'subtree descendant check' ' subtree_test_create_repo "$test_count" && - defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD") && test_create_commit "$test_count" folder_subtree/a && ( cd "$test_count" && @@ -1614,7 +1613,7 @@ test_expect_success 'subtree descendant check' ' ( cd "$test_count" && git cherry-pick $cherry && - git checkout $defaultBranch && + git checkout main && git merge -m "merge should be kept on subtree" branch && git branch no_subtree_work_branch ) && @@ -1626,10 +1625,10 @@ test_expect_success 'subtree descendant check' ' test_create_commit "$test_count" not_a_subtree_change && ( cd "$test_count" && - git checkout $defaultBranch && + git checkout main && git merge -m "merge should be skipped on subtree" no_subtree_work_branch && - git subtree split --prefix folder_subtree/ --branch subtree_tip $defaultBranch && + git subtree split --prefix folder_subtree/ --branch subtree_tip main && git subtree split --prefix folder_subtree/ --branch subtree_branch branch && test $(git rev-list --count subtree_tip..subtree_branch) = 0 ) |