Skip to content

Add support for git-worktree #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpo-joyent wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for git-worktree #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f387912
Add support for git-worktree
jpo-joyent Nov 20, 2018
40db038
Only check worktree status if known to be in repo
jpo-joyent Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ These are the defaults:
ZSH_THEME_GIT_PROMPT_HASH_PREFIX=":"
ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
ZSH_THEME_GIT_PROMPT_WORKTREE_BRANCH="%{$fg_bold[yellow]%}"
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
Expand Down
22 changes: 20 additions & 2 deletions zshrc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,31 @@ update_current_git_vars() {
GIT_UPSTREAM=$__CURRENT_GIT_STATUS[10]
GIT_MERGING=$__CURRENT_GIT_STATUS[11]
GIT_REBASE=$__CURRENT_GIT_STATUS[12]

GIT_WORKTREE=
if [ -n "$__CURRENT_GIT_STATUS" ]; then
local first=yes
git worktree list --porcelain | while read k v; do
if [ worktree = "$k" -a X"${PWD#$v}" != X"$PWD" -a -z "$first" ]; then
GIT_WORKTREE="$v"
break
fi
first=
done
fi
}

git_super_status() {
precmd_update_git_vars

if [ -n "$__CURRENT_GIT_STATUS" ]; then
local STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
local clean=1
local STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX" clean=1
if [ -n "$GIT_WORKTREE" ]; then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_WORKTREE_BRANCH"
else
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BRANCH"
fi
STATUS="$STATUS$GIT_BRANCH%{${reset_color}%}"

if [ -n "$GIT_REBASE" ] && [ "$GIT_REBASE" != "0" ]; then
STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_REBASE$GIT_REBASE%{${reset_color}%}"
Expand Down Expand Up @@ -135,6 +152,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="]"
ZSH_THEME_GIT_PROMPT_HASH_PREFIX=":"
ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
ZSH_THEME_GIT_PROMPT_WORKTREE_BRANCH="%{$fg_bold[yellow]%}"
ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
Expand Down