diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-08 10:13:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-08 17:40:18 (GMT) |
| commit | 538228ed23a1d5e17e89bb17086d4dda51325bd8 (patch) | |
| tree | df2711d111a9afe3593f9e89f94b54c21eaac090 /t/t6409-merge-subtree.sh | |
| parent | a15ad5d1bc23f3a6842360df5ee840b1dc3e4888 (diff) | |
| download | git-538228ed23a1d5e17e89bb17086d4dda51325bd8.zip git-538228ed23a1d5e17e89bb17086d4dda51325bd8.tar.gz git-538228ed23a1d5e17e89bb17086d4dda51325bd8.tar.bz2 | |
tests: avoid using the branch name `main`
In the near future, we want to change Git's default branch name to
`main`. In preparation for that, stop using it as a branch name in the
test suite. Replace that branch name by `topic`, the same name we used
to rename variations of `master` in b6211b89eb3 (tests: avoid variations
of the `master` branch name, 2020-09-26).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6409-merge-subtree.sh')
| -rwxr-xr-x | t/t6409-merge-subtree.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh index 1a0d0e2..b8e8b6f 100755 --- 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 |