Skip to content

Commit

Permalink
git: use master if it exists, otherwise use main
Browse files Browse the repository at this point in the history
See ohmyzsh#9049 (comment)

Co-authored-by: Yufan You <ouuansteve@gmail.com>
  • Loading branch information
2 people authored and grantstephens committed Jun 23, 2021
1 parent 742f601 commit aa85650
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions plugins/git/README.md
Expand Up @@ -183,8 +183,8 @@ plugins=(... git)

Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
function `git_main_branch`.
that any aliases and functions that previously used `master`, will use `main` if `master` doesn't exist. We do this via
the function `git_main_branch`.

### Deprecated aliases

Expand Down Expand Up @@ -214,7 +214,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
| current_branch | Return the name of the current branch |
| git_current_user_name | Returns the `user.name` config value |
| git_current_user_email | Returns the `user.email` config value |
| git_main_branch | Returns the name of the main branch: `main` if it exists, `master` otherwise |
| git_main_branch | Returns the name of the main branch: `master` if it exists, `main` otherwise |

### Work in Progress (WIP)

Expand Down
6 changes: 3 additions & 3 deletions plugins/git/git.plugin.zsh
Expand Up @@ -27,10 +27,10 @@ function work_in_progress() {

# Check if main exists and use instead of master
function git_main_branch() {
if [[ -n "$(git branch --list main)" ]]; then
echo main
else
if [[ -n "$(git branch --list master)" ]]; then
echo master
else
echo main
fi
}

Expand Down

0 comments on commit aa85650

Please sign in to comment.