Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2020-11-19 02:44:42 +0300
committerJunio C Hamano <gitster@pobox.com>2020-11-20 02:44:18 +0300
commita881baa2c31daa9f1d06a3b7b07054354a76dda9 (patch)
tree93f3e5e35ed97dba31573371d7265f6b32b9f2d0 /t/t9351-fast-export-anonymize.sh
parent747f6c6805c442cc74608743d14a1a47a3b1afa8 (diff)
t9[0-4]*: adjust the references to the default branch name "main"
This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t9[0-4]*.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/t9351-fast-export-anonymize.sh')
-rwxr-xr-xt/t9351-fast-export-anonymize.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
index 4130c8a837..1c6e6fcdaf 100755
--- a/t/t9351-fast-export-anonymize.sh
+++ b/t/t9351-fast-export-anonymize.sh
@@ -1,7 +1,7 @@
#!/bin/sh
test_description='basic tests for fast-export --anonymize'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -54,7 +54,7 @@ test_expect_success 'stream retains other as refname' '
'
test_expect_success 'stream omits other refnames' '
- ! grep master stream &&
+ ! grep main stream &&
! grep mytag stream
'
@@ -88,7 +88,7 @@ test_expect_success 'repo has original shape and timestamps' '
shape () {
git log --format="%m %ct" --left-right --boundary "$@"
} &&
- (cd .. && shape master...other) >expect &&
+ (cd .. && shape main...other) >expect &&
shape $main_branch...$other_branch >actual &&
test_cmp expect actual
'