diff options
Diffstat (limited to 't/t0020-crlf.sh')
| -rwxr-xr-x | t/t0020-crlf.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 0d43189048..375cf94398 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -2,7 +2,7 @@ test_description='CRLF conversion' -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh @@ -321,8 +321,8 @@ test_expect_success 'checkout with existing .gitattributes' ' git add .gitattributes .file && git commit -m second && - git checkout master~1 && - git checkout master && + git checkout main~1 && + git checkout main && test "$(git diff-files --raw)" = "" ' @@ -334,8 +334,8 @@ test_expect_success 'checkout when deleting .gitattributes' ' git add .file2 && git commit -m third && - git checkout master~1 && - git checkout master && + git checkout main~1 && + git checkout main && has_cr .file2 ' |