diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2020-11-19 02:44:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-20 02:44:18 +0300 |
| commit | 747f6c6805c442cc74608743d14a1a47a3b1afa8 (patch) | |
| tree | 5981a72c7f13960ba30c9a9695f11bcbd9551648 /t/t8003-blame-corner-cases.sh | |
| parent | 1e2ae142c06f7648a646278947bbcb61173f37eb (diff) | |
t8*: 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' -- t8*.sh annotate*.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/t8003-blame-corner-cases.sh')
| -rwxr-xr-x | t/t8003-blame-corner-cases.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 0613d889db..da80f815ce 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -1,7 +1,7 @@ #!/bin/sh test_description='git blame corner cases' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -164,13 +164,13 @@ test_expect_success 'blame wholesale copy and more in the index' ' test_expect_success 'blame during cherry-pick with file rename conflict' ' - test_when_finished "git reset --hard && git checkout master" && + test_when_finished "git reset --hard && git checkout main" && git checkout HEAD~3 && echo MOUSE >> mouse && git mv mouse rodent && git add rodent && GIT_AUTHOR_NAME=Rodent git commit -m "rodent" && - git checkout --detach master && + git checkout --detach main && (git cherry-pick HEAD@{1} || test $? -eq 1) && git show HEAD@{1}:rodent > rodent && git add rodent && |