bd5826980ea549d629feff0786f151c985525c98
- Author
- James Cox <james@imaj.es>
- Committer
- James Cox <james@imaj.es>
- Date
Message
Merge remote branch 'upstream/master'
Diff
1diff --git a/git.zsh b/git.zsh
2index faf543fd08a50a0c6041f05b8d02c9d77ce84c77..9409c92dbbe8289183be19e8d12a9b3ee2bb0324 100644
3--- a/git.zsh
4+++ b/git.zsh
5@@ -11,16 +11,10 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
6
7 # get the name of the branch we are on
8 function git_prompt_info() {
9- if [[ -d .git ]]; then
10- ref=$(git symbolic-ref HEAD 2> /dev/null) || return
11- branch=${ref#refs/heads/}
12- CURRENT_BRANCH="$ZSH_THEME_GIT_PROMPT_PREFIX${branch}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
13- else
14- CURRENT_BRANCH=''
15- fi
16-
17- echo $CURRENT_BRANCH
18+ ref=$(git symbolic-ref HEAD 2> /dev/null) || return
19+ echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
20 }
21+
22 parse_git_dirty () {
23 if [[ $(git status | tail -n1) != "nothing to commit (working directory clean)" ]]; then
24 echo "$ZSH_THEME_GIT_PROMPT_DIRTY"