Merge branch 'js/cmake-extra-built-ins-fix'

[thirdparty/git.git] / t / t6409-merge-subtree.sh

diff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh
index 1a0d0e23d028865656477343b3e550c3ed3f90ae..b8e8b6f6429e85aa456370637ca3e8c5f9e32cfc 100755 (executable)
--- a/t/t6409-merge-subtree.sh
+++ b/t/t6409-merge-subtree.sh
@@ -35,11 +35,11 @@ test_expect_success 'setup branch sub' '
        test_commit foo
 '
 
-test_expect_success 'setup branch main' '
-       git checkout -b main master &&
+test_expect_success 'setup topic branch' '
+       git checkout -b topic master &&
        git merge -s ours --no-commit --allow-unrelated-histories sub &&
        git read-tree --prefix=dir/ -u sub &&
-       git commit -m "initial merge of sub into main" &&
+       git commit -m "initial merge of sub into topic" &&
        test_path_is_file dir/foo.t &&
        test_path_is_file hello
 '
@@ -49,9 +49,9 @@ test_expect_success 'update branch sub' '
        test_commit bar
 '
 
-test_expect_success 'update branch main' '
-       git checkout main &&
-       git merge -s subtree sub -m "second merge of sub into main" &&
+test_expect_success 'update topic branch' '
+       git checkout topic &&
+       git merge -s subtree sub -m "second merge of sub into topic" &&
        test_path_is_file dir/bar.t &&
        test_path_is_file dir/foo.t &&
        test_path_is_file hello