diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-18 23:44:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-11-19 15:44:18 -0800 |
| commit | 1e2ae142c06f7648a646278947bbcb61173f37eb (patch) | |
| tree | e1050696a0fb5f407ac538f1c944e78d420da791 /t/t7612-merge-verify-signatures.sh | |
| parent | t7[0-4]*: adjust the references to the default branch name "main" (diff) | |
| download | tgif-1e2ae142c06f7648a646278947bbcb61173f37eb.tar.xz | |
t7[5-9]*: adjust the references to the default branch name "main"
Excluding t7817, which is added in an unrelated patch series at the time
of writing, this adjusts t7[5-9]*. This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t7[5-9]*.sh)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7612-merge-verify-signatures.sh')
| -rwxr-xr-x | t/t7612-merge-verify-signatures.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh index b4ec88f996..61330f71b1 100755 --- a/t/t7612-merge-verify-signatures.sh +++ b/t/t7612-merge-verify-signatures.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='merge signature verification tests' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -34,7 +34,7 @@ test_expect_success GPG 'create signed commits' ' echo 3 >baz && git add baz && test_tick && git commit -SB7227189 -m "untrusted on side" && - git checkout master + git checkout main ' test_expect_success GPG 'merge unsigned commit with verification' ' |