51772732f54f01522ad5720e8ed0ba16ca3147ae

Author
Alisson B. Santos <alissonbruno.sa@gmail.com>
Committer
GitHub <noreply@github.com>
Date

Message

feat(git): support trunk branches in `git_main_branch` (#9417)

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index ccb9d846135a35c05525a60f9acc6ea0f198558b..bf26199768f3fc9015b51ac10e53f5f2cbdf0f87 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -31,11 +31,14 @@ function work_in_progress() {
 6 
 7 # Check if main exists and use instead of master
 8 function git_main_branch() {
 9-  if [[ -n "$(git branch --list main)" ]]; then
10-    echo main
11-  else
12-    echo master
13-  fi
14+  local branch
15+  for branch in main trunk; do
16+    if command git show-ref -q --verify refs/heads/$branch; then
17+      echo $branch
18+      return
19+    fi
20+  done
21+  echo master
22 }
23 
24 #