diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-08 13:13:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-08 20:40:18 +0300 |
| commit | 538228ed23a1d5e17e89bb17086d4dda51325bd8 (patch) | |
| tree | df2711d111a9afe3593f9e89f94b54c21eaac090 /t/t6400-merge-df.sh | |
| parent | a15ad5d1bc23f3a6842360df5ee840b1dc3e4888 (diff) | |
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/t6400-merge-df.sh')
| -rwxr-xr-x | t/t6400-merge-df.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh index 400a4cd139..f1b84617af 100755 --- a/t/t6400-merge-df.sh +++ b/t/t6400-merge-df.sh @@ -124,7 +124,7 @@ test_expect_success 'Simple merge in repo with interesting pathnames' ' git add . && git commit -m initial && - git branch main && + git branch topic && git branch other && git checkout other && @@ -132,10 +132,10 @@ test_expect_success 'Simple merge in repo with interesting pathnames' ' git add -u && git commit -m other && - git checkout main && - echo main >foo/bar/baz && + git checkout topic && + echo topic >foo/bar/baz && git add -u && - git commit -m main && + git commit -m topic && git merge other && git ls-files -s >out && |