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
Oh My Zsh
Commits
51772732
Unverified
Commit
51772732
authored
Nov 12, 2020
by
Alisson B. Santos
Committed by
GitHub
Nov 12, 2020
Browse files
feat(git): support trunk branches in `git_main_branch` (#9417)
parent
874d83f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
plugins/git/git.plugin.zsh
View file @
51772732
...
@@ -31,11 +31,14 @@ function work_in_progress() {
...
@@ -31,11 +31,14 @@ 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
()
{
if
[[
-n
"
$(
git branch
--list
main
)
"
]]
;
then
local
branch
echo
main
for
branch
in
main trunk
;
do
else
if
command
git show-ref
-q
--verify
refs/heads/
$branch
;
then
echo
master
echo
$branch
fi
return
fi
done
echo
master
}
}
#
#
...
...
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