diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
| commit | 8b70966aa90b52427e1a09329abde8d845f90398 (patch) | |
| tree | e32f04b3116b3f67bd1980e493d4230159bc0301 /t/t5505-remote.sh | |
| parent | 8dcf73c5c94077fa83aa53ae427183b70fd4b6ca (diff) | |
tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
We introduced the `PREPARE_FOR_MAIN_BRANCH` prereq for the sole purpose
of allowing us to perform the non-trivial adjustments regarding the
`master` -> `main` rename before the automatable ones.
Now that the transition is almost complete, we can stop using it in most
instances. The only two exceptions are t5526 and t9902: at the time of
writing, there are other patches in flight that touch these test
scripts, therefore their transition to `main` is postponed to a later
date.
This patch is the result of this command:
sed -i 's/PREPARE_FOR_MAIN_BRANCH[ ,]//' t/t[0-9]*.sh &&
git checkout HEAD -- t/t5526\* t/t9902\*
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index f7e3c9b1e7..59fbb1fa7f 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -237,7 +237,7 @@ cat >test/expect <<EOF main pushes to another (up to date) EOF -test_expect_success PREPARE_FOR_MAIN_BRANCH 'show' ' +test_expect_success 'show' ' ( cd test && git config --add remote.origin.fetch refs/heads/main:refs/heads/upstream && @@ -288,7 +288,7 @@ cat >test/expect <<EOF refs/tags/lastbackup forces to refs/tags/lastbackup EOF -test_expect_success PREPARE_FOR_MAIN_BRANCH 'show -n' ' +test_expect_success 'show -n' ' mv one one.unreachable && ( cd test && @@ -331,7 +331,7 @@ test_expect_success 'set-head --auto' ' ) ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'set-head --auto has no problem w/multiple HEADs' ' +test_expect_success 'set-head --auto has no problem w/multiple HEADs' ' ( cd test && git fetch two "refs/heads/*:refs/remotes/two/*" && @@ -1351,7 +1351,7 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' ' ) ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' ' +test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' ' ( cd two && git tag -a -m "Some tag" my-tag main && |