[27/28] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed

Message ID	09b611a3598553b0576fd174ff0ac66a8584ba22.1605221040.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <09b611a3598553b0576fd174ff0ac66a8584ba22.1605221040.git.gitgitgadget@gmail.com> In-Reply-To: <pull.762.git.1605221038.gitgitgadget@gmail.com> References: <pull.762.git.1605221038.gitgitgadget@gmail.com> Date: Thu, 12 Nov 2020 22:43:57 +0000 Subject: [PATCH 27/28] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, Johannes Schindelin <johannes.schindelin@gmx.de> Precedence: bulk From: Johannes Schindelin <johannes.schindelin@gmx.de>
Series	Use main as default branch name \| expand [00/28] Use main as default branch name [01/28] t0060: preemptively adjust alignment [03/28] t2: adjust the references to the default branch name "main" [04/28] t3[0-3]: adjust the references to the default branch name "main" [05/28] t3416: preemptively adjust alignment in a comment [06/28] t34: adjust the references to the default branch name "main" [07/28] t3[5-9]: adjust the references to the default branch name "main" [08/28] t4: adjust the references to the default branch name "main" [09/28] t5323: prepare centered comment for `master` -> `main` [10/28] t5[0-4]: adjust the references to the default branch name "main" [11/28] t5503: prepare aligned comment for replacing `master` with `main` [12/28] t550: adjust the references to the default branch name "main" [13/28] t551: adjust the references to the default branch name "main" [14/28] t55[23]: adjust the references to the default branch name "main" [15/28] t55[4-9]: adjust the references to the default branch name "main" [16/28] t5[6-9]: adjust the references to the default branch name "main" [17/28] t6[0-3]: adjust the references to the default branch name "main" [18/28] t64: preemptively adjust alignment to prepare for `master` -> `main` [19/28] t6[4-9]: adjust the references to the default branch name "main" [20/28] t7[0-4]: adjust the references to the default branch name "main" [21/28] t7[5-9]: adjust the references to the default branch name "main" [22/28] t8: adjust the references to the default branch name "main" [23/28] t9[0-4]: adjust the references to the default branch name "main" [24/28] t9[5-7]: adjust the references to the default branch name "main" [25/28] tests(git-p4): transition to the default branch name `main` [26/28] t99: adjust the references to the default branch name "main" [27/28] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed [28/28] Change the default branch name to `main`

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 3265a8c58e..127efff136 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -585,7 +585,7 @@ test_expect_success 'stdin fails on unbalanced quotes' ' grep "fatal: badly quoted argument: \\\"main" err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin fails on invalid escape' ' +test_expect_success 'stdin fails on invalid escape' ' echo "create $a \"ma\zn\"" >stdin && test_must_fail git update-ref --stdin <stdin 2>err && grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err @@ -704,7 +704,7 @@ test_expect_success 'stdin succeeds with quoted argument' ' test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'stdin succeeds with escaped character' ' +test_expect_success 'stdin succeeds with escaped character' ' git update-ref -d $a && echo "create $a \"ma\\151n\"" >stdin && git update-ref --stdin <stdin && diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 63036e0369..430f5af21b 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -321,7 +321,7 @@ test_expect_success 'git branch --list -v with --abbrev' ' ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch --column' ' +test_expect_success 'git branch --column' ' COLUMNS=81 git branch --column=column >actual && cat >expect <<\EOF && a/b/c bam foo l * main n o/p r @@ -358,7 +358,7 @@ EOF test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch with column.*' ' +test_expect_success 'git branch with column.*' ' git config column.ui column && git config column.branch "dense" && COLUMNS=80 git branch >actual && @@ -375,7 +375,7 @@ test_expect_success 'git branch --column -v should fail' ' test_must_fail git branch --column -v ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'git branch -v with column.ui ignored' ' +test_expect_success 'git branch -v with column.ui ignored' ' git config column.ui column && COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual && git config --unset column.ui && diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh index 110cfef820..f39ae97264 100755 --- a/t/t3201-branch-contains.sh +++ b/t/t3201-branch-contains.sh @@ -242,7 +242,7 @@ test_expect_success 'branch --merged combined with --no-merged' ' # Here "topic" tracks "main" with one extra commit, and "zzz" points to the # same tip as main The name "zzz" must come alphabetically after "topic" # as we process them in that order. -test_expect_success PREPARE_FOR_MAIN_BRANCH 'branch --merged with --verbose' ' +test_expect_success 'branch --merged with --verbose' ' git branch --track topic main && git branch zzz topic && git checkout topic && diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 727c9d9caa..211eb8357f 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -329,7 +329,7 @@ test_expect_success '--color overrides auto-color' ' test_cmp expect.color actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output lists worktree path' ' +test_expect_success 'verbose output lists worktree path' ' one=$(git rev-parse --short HEAD) && two=$(git rev-parse --short main) && cat >expect <<-EOF && diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh index 9f2fb785d2..2eb619231d 100755 --- a/t/t3205-branch-color.sh +++ b/t/t3205-branch-color.sh @@ -28,7 +28,7 @@ test_expect_success 'regular output shows colors' ' test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'verbose output shows colors' ' +test_expect_success 'verbose output shows colors' ' oid=$(git rev-parse --short HEAD) && cat >expect <<-EOF && * <CYAN>main <RESET> $oid foo diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 540d65aa22..869109a2c6 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -234,7 +234,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 && @@ -285,7 +285,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 && @@ -328,7 +328,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/*" && @@ -1348,7 +1348,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 && diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 206e3be695..f8bcaeca08 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -942,7 +942,7 @@ test_expect_success 'fetching with auto-gc does not lock up' ' ) ' -test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned output' ' +test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' ' git clone . full-output && test_commit looooooooooooong-tag && ( @@ -957,7 +957,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch aligned outpu test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH,C_LOCALE_OUTPUT 'fetch compact output' ' +test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' git clone . compact && test_commit extraaa && ( diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index f45ba02b8a..356ce31d48 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -61,7 +61,7 @@ test_expect_success setup ' ) ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses into submodules" ' +test_expect_success "fetch --recurse-submodules recurses into submodules" ' add_upstream_commit && ( cd downstream && @@ -71,7 +71,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules recurses test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers recursive fetch" ' +test_expect_success "submodule.recurse option triggers recursive fetch" ' add_upstream_commit && ( cd downstream && @@ -81,7 +81,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "submodule.recurse option triggers r test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "fetch --recurse-submodules -j2 has the same output behaviour" ' +test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" ' add_upstream_commit && ( cd downstream && @@ -111,7 +111,7 @@ test_expect_success "fetch --no-recurse-submodules only fetches superproject" ' test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" ' +test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" ' ( cd downstream && git config -f .gitmodules submodule.submodule.fetchRecurseSubmodules true && @@ -141,7 +141,7 @@ test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" ' +test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" ' ( cd downstream && git fetch --recurse-submodules >../actual.out 2>../actual.err && @@ -170,7 +170,7 @@ test_expect_success "--quiet propagates to parallel submodules" ' test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" ' +test_expect_success "--dry-run propagates to submodules" ' add_upstream_commit && ( cd downstream && @@ -180,7 +180,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "--dry-run propagates to submodules" test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to submodules" ' +test_expect_success "Without --dry-run propagates to submodules" ' ( cd downstream && git fetch --recurse-submodules >../actual.out 2>../actual.err @@ -189,7 +189,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Without --dry-run propagates to sub test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates into submodules" ' +test_expect_success "recurseSubmodules=true propagates into submodules" ' add_upstream_commit && ( cd downstream && @@ -200,7 +200,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "recurseSubmodules=true propagates i test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "--recurse-submodules overrides config in submodule" ' +test_expect_success "--recurse-submodules overrides config in submodule" ' add_upstream_commit && ( cd downstream && @@ -225,7 +225,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" ' test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no new commits are fetched in the superproject" ' +test_expect_success "Recursion doesn't happen when no new commits are fetched in the superproject" ' ( cd downstream && ( @@ -239,7 +239,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when no ne test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodule commits are fetched" ' +test_expect_success "Recursion stops when no new submodule commits are fetched" ' head1=$(git rev-parse --short HEAD) && git add submodule && git commit -m "new submodule" && @@ -255,7 +255,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion stops when no new submodu test_must_be_empty actual.out ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new superproject commits don't change any submodules" ' +test_expect_success "Recursion doesn't happen when new superproject commits don't change any submodules" ' add_upstream_commit && head1=$(git rev-parse --short HEAD) && echo a > file && @@ -272,7 +272,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion doesn't happen when new s test_i18ncmp expect.err.file actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submodule" ' +test_expect_success "Recursion picks up config in submodule" ' ( cd downstream && git fetch --recurse-submodules && @@ -301,7 +301,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up config in submod test_must_be_empty actual.out ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules when necessary" ' +test_expect_success "Recursion picks up all submodules when necessary" ' add_upstream_commit && ( cd submodule && @@ -334,7 +334,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "Recursion picks up all submodules w test_must_be_empty actual.out ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" ' +test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)" ' add_upstream_commit && ( cd submodule && @@ -361,7 +361,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' do test_must_be_empty actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" ' +test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" ' head1=$(git rev-parse --short HEAD) && git add submodule && git commit -m "new submodule" && @@ -389,7 +389,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' re test_i18ncmp expect.err actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" ' +test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" ' add_upstream_commit && head1=$(git rev-parse --short HEAD) && echo a >> file && @@ -406,7 +406,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'--recurse-submodules=on-demand' st test_i18ncmp expect.err.file actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' overrides global config" ' +test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" ' ( cd downstream && git fetch --recurse-submodules @@ -434,7 +434,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' test_i18ncmp expect.err.2 actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" ' +test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" ' ( cd downstream && git fetch --recurse-submodules @@ -462,7 +462,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "'submodule.<sub>.fetchRecurseSubmod test_i18ncmp expect.err.2 actual.err ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly recorded commits are already present" ' +test_expect_success "don't fetch submodule when newly recorded commits are already present" ' ( cd submodule && git checkout -q HEAD^^ @@ -485,7 +485,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH "don't fetch submodule when newly re ) ' -test_expect_success PREPARE_FOR_MAIN_BRANCH "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" ' +test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" ' ( cd downstream && git fetch --recurse-submodules diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh index bbf03a8f66..fe89ea55b1 100755 --- a/t/t5703-upload-pack-ref-in-want.sh +++ b/t/t5703-upload-pack-ref-in-want.sh @@ -383,7 +383,7 @@ test_expect_success 'server is initially behind - ref in want' ' test_cmp expected actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' ' +test_expect_success 'server loses a ref - ref in want' ' git -C "$REPO" config uploadpack.allowRefInWant true && rm -rf local && cp -r "$LOCAL_PRISTINE" local && diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index f5a55c1991..7a45bbf048 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -113,7 +113,7 @@ test_expect_success '%(color) must fail' ' test_must_fail git for-each-ref --format="%(color)%(refname)" ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' ' +test_expect_success 'left alignment is default' ' cat >expect <<-\EOF && refname is refs/heads/main |refs/heads/main refname is refs/heads/side |refs/heads/side @@ -131,7 +131,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'left alignment is default' ' test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' ' +test_expect_success 'middle alignment' ' cat >expect <<-\EOF && | refname is refs/heads/main |refs/heads/main | refname is refs/heads/side |refs/heads/side @@ -149,7 +149,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'middle alignment' ' test_cmp expect actual ' -test_expect_success PREPARE_FOR_MAIN_BRANCH 'right alignment' ' +test_expect_success 'right alignment' ' cat >expect <<-\EOF && | refname is refs/heads/main|refs/heads/main | refname is refs/heads/side|refs/heads/side @@ -184,7 +184,7 @@ EOF test_align_permutations() { while read -r option do - test_expect_success PREPARE_FOR_MAIN_BRANCH "align:$option" ' + test_expect_success "align:$option" ' git for-each-ref --format="|%(align:$option)refname is %(refname)%(end)|%(refname)" >actual && test_cmp expect actual ' @@ -213,7 +213,7 @@ EOF # Individual atoms inside %(align:...) and %(end) must not be quoted. -test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' " +test_expect_success 'alignment with format quote' " cat >expect <<-\EOF && |' '\''main| A U Thor'\'' '| |' '\''side| A U Thor'\'' '| @@ -231,7 +231,7 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'alignment with format quote' " test_cmp expect actual " -test_expect_success PREPARE_FOR_MAIN_BRANCH 'nested alignment with quote formatting' " +test_expect_success 'nested alignment with quote formatting' " cat >expect <<-\EOF && |' main '| |' side '|

[27/28] tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed

Commit Message

Patch