File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ load test_helper
6666 echo ' @todo' > $TEST_REPO /history_failure.txt
6767 git add -A
6868 git commit -m " Testing history"
69- git checkout master
69+ git checkout main
7070 cd -
7171 repo_run git-secrets --scan-history
7272 [ $status -eq 1 ]
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ load test_helper
1313 echo ' Fixing!' > data.txt
1414 git add -A
1515 git commit -m ' Fixing commit'
16- git checkout master
16+ git checkout main
1717 run git merge --no-ff feature
1818 [ $status -eq 1 ]
1919}
@@ -27,7 +27,7 @@ load test_helper
2727 echo ' Not bad' > data.txt
2828 git add -A
2929 git commit -m ' Good commit'
30- git checkout master
30+ git checkout main
3131 run git merge --no-ff feature
3232 [ $status -eq 0 ]
3333}
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ setup_repo() {
3030 delete_repo
3131 mkdir -p $TEST_REPO
3232 cd $TEST_REPO
33- git init --initial-branch=master
33+ git init --initial-branch=main
3434 git config --local --add secrets.patterns ' @todo'
3535 git config --local --add secrets.patterns ' forbidden|me'
3636 git config --local --add secrets.patterns ' #hash'
You can’t perform that action at this time.
0 commit comments