github/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-09-20 01:36:15 +08:00
Code Issues Projects Releases Wiki Activity

feat(git): use remote default branch to guess main branch (#13212)

Browse Source 
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
This commit is contained in:
ElisarEisenbach 2025-08-26 06:13:21 +03:00 committed by GitHub
parent 266bc17ab3
commit 2525dae661
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/git/git.plugin.zsh
View File

@ -31,16 +31,26 @@ function git_develop_branch() {
return 1
}
# Check if main exists and use instead of master
# Get the default branch name from common branch names or fallback to remote HEAD
function git_main_branch() {
command git rev-parse --git-dir &>/dev/null || return
local ref
local remote ref
for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default,stable,master}; do
if command git show-ref -q --verify $ref; then
echo ${ref:t}
return 0
fi
done
# Fallback: try to get the default branch from remote HEAD symbolic refs
for remote in origin upstream; do
ref=$(command git rev-parse --abbrev-ref $remote/HEAD 2>/dev/null)
if [[ $ref == $remote/* ]]; then
echo ${ref#"$remote/"}; return 0
fi
done
# If no main branch was found, fall back to master but return error
echo master