mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-12 20:21:02 +01:00
Merge remote branch 'upstream/master'
This commit is contained in:
commit
bd5826980e
1 changed files with 3 additions and 9 deletions
12
git.zsh
12
git.zsh
|
@ -11,16 +11,10 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
|
|||
|
||||
# get the name of the branch we are on
|
||||
function git_prompt_info() {
|
||||
if [[ -d .git ]]; then
|
||||
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
||||
branch=${ref#refs/heads/}
|
||||
CURRENT_BRANCH="$ZSH_THEME_GIT_PROMPT_PREFIX${branch}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||
else
|
||||
CURRENT_BRANCH=''
|
||||
fi
|
||||
|
||||
echo $CURRENT_BRANCH
|
||||
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
||||
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||
}
|
||||
|
||||
parse_git_dirty () {
|
||||
if [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]]; then
|
||||
echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
|
||||
|
|
Loading…
Reference in a new issue