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/t6430-merge-recursive.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/t6430-merge-recursive.sh')
| -rwxr-xr-x | t/t6430-merge-recursive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh index d48d211..a328260 100755 --- a/t/t6430-merge-recursive.sh +++ b/t/t6430-merge-recursive.sh @@ -663,7 +663,7 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' ' test_expect_success 'merging with triple rename across D/F conflict' ' git reset --hard HEAD && - git checkout -b main && + git checkout -b topic && git rm -rf . && echo "just a file" >sub1 && @@ -682,7 +682,7 @@ test_expect_success 'merging with triple rename across D/F conflict' ' test_tick && git commit -a -m changesimplefile && - git checkout main && + git checkout topic && git rm sub1 && git mv sub2 sub1 && test_tick && |