averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cs/subtree-reftable-testfix' into next

Browse Source 
Test fix (in contrib/)

* cs/subtree-reftable-testfix:
  contrib/subtree: fix tests with reftable backend
This commit is contained in:
Junio C Hamano
2026-02-05 16:06:12 -08:00
parent 0755d57f09 486386c687
commit d953fc69cc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
)