diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
| commit | 1e2ae142c06f7648a646278947bbcb61173f37eb (patch) | |
| tree | e1050696a0fb5f407ac538f1c944e78d420da791 /t/t7501-commit-basic-functionality.sh | |
| parent | 01dc81336dc10c8f2350454c755a8a0ab676a9c9 (diff) | |
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/t7501-commit-basic-functionality.sh')
| -rwxr-xr-x | t/t7501-commit-basic-functionality.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh index 9a1414f31d..0f936182e4 100755 --- a/t/t7501-commit-basic-functionality.sh +++ b/t/t7501-commit-basic-functionality.sh @@ -7,7 +7,7 @@ # signoff test_description='git commit' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -606,7 +606,7 @@ test_expect_success 'same tree (merge and amend merge)' ' echo zero >zero && git add zero && git commit -m "add zero" && - git checkout master && + git checkout main && git merge -s ours side -m "empty ok" && git diff HEAD^ HEAD >actual && |