diff options
author | Alisson B. Santos <alissonbruno.sa@gmail.com> | 2020-11-12 16:17:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-12 16:17:28 +0100 |
commit | 51772732f54f01522ad5720e8ed0ba16ca3147ae (patch) | |
tree | 22ee0522a0d8b8a193d378b00e00b19be5908745 | |
parent | 874d83f7b86afbc395915e796cff4e4fe949a204 (diff) | |
download | zsh-51772732f54f01522ad5720e8ed0ba16ca3147ae.tar.gz zsh-51772732f54f01522ad5720e8ed0ba16ca3147ae.tar.bz2 zsh-51772732f54f01522ad5720e8ed0ba16ca3147ae.zip |
feat(git): support trunk branches in `git_main_branch` (#9417)
-rw-r--r-- | plugins/git/git.plugin.zsh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index ccb9d8461..bf2619976 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -31,11 +31,14 @@ 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 - echo master - fi + local branch + for branch in main trunk; do + if command git show-ref -q --verify refs/heads/$branch; then + echo $branch + return + fi + done + echo master } # |