From 51772732f54f01522ad5720e8ed0ba16ca3147ae Mon Sep 17 00:00:00 2001 From: "Alisson B. Santos" Date: Thu, 12 Nov 2020 16:17:28 +0100 Subject: [PATCH] feat(git): support trunk branches in `git_main_branch` (#9417) --- plugins/git/git.plugin.zsh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index ccb9d846..bf261997 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 } #