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 793f0c8bf38aba350542c0710f509a1c69b33a9b..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
@@ -94,10 +94,10 @@ test_expect_success 'merge update' '
        echo git-gui2 > git-gui.sh &&
        o3=$(git hash-object git-gui.sh) &&
        git add git-gui.sh &&
-       git checkout -b master2 &&
+       git checkout -b topic_2 &&
        git commit -m "update git-gui" &&
        cd ../git &&
-       git pull -s subtree gui master2 &&
+       git pull -s subtree gui topic_2 &&
        git ls-files -s >actual &&
        (
                echo "100644 $o3 0      git-gui/git-gui.sh" &&
@@ -109,7 +109,7 @@ test_expect_success 'merge update' '
 test_expect_success 'initial ambiguous subtree' '
        cd ../git &&
        git reset --hard master &&
-       git checkout -b master2 &&
+       git checkout -b topic_2 &&
        git merge -s ours --no-commit gui/master &&
        git read-tree --prefix=git-gui2/ -u gui/master &&
        git commit -m "Merge git-gui2 as our subdirectory" &&
@@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' '
 
 test_expect_success 'merge using explicit' '
        cd ../git &&
-       git reset --hard master2 &&
-       git pull -Xsubtree=git-gui gui master2 &&
+       git reset --hard topic_2 &&
+       git pull -Xsubtree=git-gui gui topic_2 &&
        git ls-files -s >actual &&
        (
                echo "100644 $o3 0      git-gui/git-gui.sh" &&
@@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' '
 
 test_expect_success 'merge2 using explicit' '
        cd ../git &&
-       git reset --hard master2 &&
-       git pull -Xsubtree=git-gui2 gui master2 &&
+       git reset --hard topic_2 &&
+       git pull -Xsubtree=git-gui2 gui topic_2 &&
        git ls-files -s >actual &&
        (
                echo "100644 $o1 0      git-gui/git-gui.sh" &&