浏览代码

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

Alisson B. Santos 3 年之前
父节点
当前提交
51772732f5
共有 1 个文件被更改,包括 8 次插入5 次删除
  1. 8 5
      plugins/git/git.plugin.zsh

+ 8 - 5
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
 }
 
 #