diff options
| author | Ted Vessenes <tvessene@akamai.com> | 2012-07-31 13:27:40 -0400 |
|---|---|---|
| committer | Ted Vessenes <tvessene@akamai.com> | 2012-07-31 13:27:40 -0400 |
| commit | 027fcccc9256aaf63e0d1b812069a1a0880f46fa (patch) | |
| tree | 306d5c0eb0b84e90f5dc48c6977eddc537a7a555 | |
| parent | d05b2010ffd4cd33ff9402c402051b1caf985d97 (diff) | |
| download | zsh-027fcccc9256aaf63e0d1b812069a1a0880f46fa.tar.gz zsh-027fcccc9256aaf63e0d1b812069a1a0880f46fa.tar.bz2 zsh-027fcccc9256aaf63e0d1b812069a1a0880f46fa.zip | |
Make git use sha when branch name is missing.
| -rw-r--r-- | lib/git.zsh | 3 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index fb4ad8ca6..af8b153d9 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -1,6 +1,7 @@ # get the name of the branch we are on function git_prompt_info() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return + ref=$(git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(git rev-parse --short HEAD 2> /dev/null) || return echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" } diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d3d3f702a..14237cebe 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -50,13 +50,14 @@ alias gsd='git svn dcommit' # Usage example: git pull origin $(current_branch) # function current_branch() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || return + ref=$(git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(git rev-parse --short HEAD 2> /dev/null) || return echo ${ref#refs/heads/} } function current_repository() { - - ref=$(git symbolic-ref HEAD 2> /dev/null) || return + ref=$(git symbolic-ref HEAD 2> /dev/null) || \ + ref=$(git rev-parse --short HEAD 2> /dev/null) || return echo $(git remote -v | cut -d':' -f 2) } |