Skip to content

Commit

Permalink
Replace master by main in scripts and doc
Browse files Browse the repository at this point in the history
  • Loading branch information
sbeyer committed Aug 6, 2023
1 parent f297efd commit 204b09a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ bandit
[![Stars](https://img.shields.io/github/stars/banditcpp/bandit.svg)](https://github.com/banditcpp/bandit/stargazers)
[![Forks](https://img.shields.io/github/forks/banditcpp/bandit.svg)](https://github.com/banditcpp/bandit/network/members)
[![Commits per year](https://img.shields.io/github/commit-activity/y/banditcpp/bandit.svg)](https://github.com/banditcpp/bandit/graphs/code-frequency)
[![Last commit](https://img.shields.io/github/last-commit/banditcpp/bandit/master.svg)](https://github.com/banditcpp/bandit/commits/master)
[![Travis CI Status](https://img.shields.io/travis/banditcpp/bandit/master.svg?label=tests+on+UNIX)](https://travis-ci.org/banditcpp/bandit)
[![AppVeyor Status](https://img.shields.io/appveyor/ci/banditcpp/bandit/master.svg?label=tests+on+Windows)](https://ci.appveyor.com/project/banditcpp/bandit)
[![Codecov Badge](https://img.shields.io/codecov/c/github/banditcpp/bandit/master.svg)](https://codecov.io/gh/banditcpp/bandit)
[![Codacy Badge](https://img.shields.io/codacy/grade/8b00743b0047469bbe794cdc35832a73/master.svg)](https://www.codacy.com/app/sbeyer/bandit?utm_source=github.com&utm_medium=referral&utm_content=banditcpp/bandit&utm_campaign=Badge_Grade)
[![Last commit](https://img.shields.io/github/last-commit/banditcpp/bandit/main.svg)](https://github.com/banditcpp/bandit/commits/main)
[![Travis CI Status](https://img.shields.io/travis/banditcpp/bandit/main.svg?label=tests+on+UNIX)](https://travis-ci.org/banditcpp/bandit)
[![AppVeyor Status](https://img.shields.io/appveyor/ci/banditcpp/bandit/main.svg?label=tests+on+Windows)](https://ci.appveyor.com/project/banditcpp/bandit)
[![Codecov Badge](https://img.shields.io/codecov/c/github/banditcpp/bandit/main.svg)](https://codecov.io/gh/banditcpp/bandit)
[![Codacy Badge](https://img.shields.io/codacy/grade/8b00743b0047469bbe794cdc35832a73/main.svg)](https://www.codacy.com/app/sbeyer/bandit?utm_source=github.com&utm_medium=referral&utm_content=banditcpp/bandit&utm_campaign=Badge_Grade)
[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/14169.svg)](https://scan.coverity.com/projects/banditcpp-bandit)
[![Issues](https://img.shields.io/github/issues/banditcpp/bandit.svg)](https://github.com/banditcpp/bandit/issues)
[![Pull Requests](https://img.shields.io/github/issues-pr/banditcpp/bandit.svg)](https://github.com/banditcpp/bandit/pulls)
Expand Down
6 changes: 3 additions & 3 deletions util/update_headers-only.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ cleanup () {
}

git checkout headers-only &&
git merge -s recursive -X subtree=bandit master || bash
git merge -s recursive -X subtree=bandit main || bash
git merge --abort 2>/dev/null && exit 1
commit="$(git show | grep ^Merge | cut -d ' ' -f 3)"
test -z "$commit" && cleanup # finished if merge had nothing to do

# update docs
git show master:docs/LICENSE.txt >LICENSE.txt
git show master:docs/index.md >README.md
git show main:docs/LICENSE.txt >LICENSE.txt
git show main:docs/index.md >README.md
git diff-index --exit-code --stat HEAD --ignore-submodules ||
git commit -C HEAD -a --amend

Expand Down

0 comments on commit 204b09a

Please sign in to comment.