diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-10-23 17:00:05 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-23 18:57:42 +0300 |
commit | 66713e84e713066f4984efdd1444a7567c4d9bde (patch) | |
tree | f27bc88694fc388fc124da526414779de874d17c /t/t5505-remote.sh | |
parent | 8164360fc8631d4090486b42e283c742a84887f8 (diff) |
tests: prepare aligned mentions of the default branch name
In some tests, the default branch name is part of aligned output. As we
want to change the default branch name to `main`, which is two
characters shorter than the old default branch name, we will have to
adjust those tests.
Since we use the original default branch name until the entire test
suite has been adjusted accordingly, the touched test cases need to be
guarded by a prereq (that is so far disabled so that they are skipped
for now).
The test cases that depend on those test cases that are newly guarded by
that prereq naturally have to be guarded, too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5505-remote.sh')
-rwxr-xr-x | t/t5505-remote.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 8d62edd98b..de0e3df14a 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -200,28 +200,28 @@ cat >test/expect <<EOF Push URL: $(pwd)/one HEAD branch: master Remote branches: - master new (next fetch will store in remotes/origin) - side tracked + main new (next fetch will store in remotes/origin) + side tracked Local branches configured for 'git pull': - ahead merges with remote master - master merges with remote master + ahead merges with remote main + main merges with remote main octopus merges with remote topic-a and with remote topic-b and with remote topic-c rebase rebases onto remote master Local refs configured for 'git push': - master pushes to master (local out of date) - master pushes to upstream (create) + main pushes to main (local out of date) + main pushes to upstream (create) * remote two Fetch URL: ../two Push URL: ../three HEAD branch: master Local refs configured for 'git push': - ahead forces to master (fast-forwardable) - master pushes to another (up to date) + ahead forces to main (fast-forwardable) + main pushes to another (up to date) EOF -test_expect_success 'show' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'show' ' ( cd test && git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream && @@ -264,15 +264,15 @@ cat >test/expect <<EOF master side Local branches configured for 'git pull': - ahead merges with remote master - master merges with remote master + ahead merges with remote main + main merges with remote main Local refs configured for 'git push' (status not queried): (matching) pushes to (matching) - refs/heads/master pushes to refs/heads/upstream + refs/heads/main pushes to refs/heads/upstream refs/tags/lastbackup forces to refs/tags/lastbackup EOF -test_expect_success 'show -n' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'show -n' ' mv one one.unreachable && ( cd test && @@ -315,7 +315,7 @@ test_expect_success 'set-head --auto' ' ) ' -test_expect_success 'set-head --auto has no problem w/multiple HEADs' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'set-head --auto has no problem w/multiple HEADs' ' ( cd test && git fetch two "refs/heads/*:refs/remotes/two/*" && @@ -1335,7 +1335,7 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' ' ) ' -test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' ' +test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' ' ( cd two && git tag -a -m "Some tag" my-tag master && |