Skip to content

Commit

Permalink
Use main branch instead of master in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sparr committed Jun 20, 2023
1 parent 0ab55f8 commit 1d0b33b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/git-secrets.bats
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ load test_helper
echo '@todo' > $TEST_REPO/history_failure.txt
git add -A
git commit -m "Testing history"
git checkout master
git checkout main
cd -
repo_run git-secrets --scan-history
[ $status -eq 1 ]
Expand Down
4 changes: 2 additions & 2 deletions test/prepare-commit-msg.bats
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ load test_helper
echo 'Fixing!' > data.txt
git add -A
git commit -m 'Fixing commit'
git checkout master
git checkout main
run git merge --no-ff feature
[ $status -eq 1 ]
}
Expand All @@ -27,7 +27,7 @@ load test_helper
echo 'Not bad' > data.txt
git add -A
git commit -m 'Good commit'
git checkout master
git checkout main
run git merge --no-ff feature
[ $status -eq 0 ]
}
2 changes: 1 addition & 1 deletion test/test_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ setup_repo() {
delete_repo
mkdir -p $TEST_REPO
cd $TEST_REPO
git init --initial-branch=master
git init --initial-branch=main
git config --local --add secrets.patterns '@todo'
git config --local --add secrets.patterns 'forbidden|me'
git config --local --add secrets.patterns '#hash'
Expand Down

0 comments on commit 1d0b33b

Please sign in to comment.