Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
53b54f5f
Unverified
Commit
53b54f5f
authored
Sep 03, 2021
by
Vitaly Polonetsky
Committed by
GitHub
Sep 03, 2021
Browse files
feat(git): guess main branch name also from remotes (#10158)
Co-authored-by:
Marc Cornellà
<
hello@mcornella.com
>
parent
21b385e7
Changes
1
Show whitespace changes
Inline
Side-by-side
plugins/git/git.plugin.zsh
View file @
53b54f5f
...
@@ -32,10 +32,10 @@ function work_in_progress() {
...
@@ -32,10 +32,10 @@ function work_in_progress() {
# Check if main exists and use instead of master
# Check if main exists and use instead of master
function
git_main_branch
()
{
function
git_main_branch
()
{
command
git rev-parse
--git-dir
&>/dev/null
||
return
command
git rev-parse
--git-dir
&>/dev/null
||
return
local
branch
local
ref
for
branch
in
main
trunk
;
do
for
ref
in
refs/
{
heads,remotes/
{
origin,upstream
}}
/
{
main
,
trunk
}
;
do
if
command
git show-ref
-q
--verify
ref
s/heads/
$branch
;
then
if
command
git show-ref
-q
--verify
$
ref
;
then
echo
$
branch
echo
$
{
ref
:t
}
return
return
fi
fi
done
done
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment