027fcccc9256aaf63e0d1b812069a1a0880f46fa
- Author
- Ted Vessenes <tvessene@akamai.com>
- Committer
- Ted Vessenes <tvessene@akamai.com>
- Date
Message
Make git use sha when branch name is missing.
Diff
1diff --git a/lib/git.zsh b/lib/git.zsh
2index fb4ad8ca64ffbf7bcfd34ca82b1acbe8947d36bf..af8b153d99f5ca6d5d1fbc3d0b372a849d85017c 100644
3--- a/lib/git.zsh
4+++ b/lib/git.zsh
5@@ -1,6 +1,7 @@
6 # get the name of the branch we are on
7 function git_prompt_info() {
8- ref=$(git symbolic-ref HEAD 2> /dev/null) || return
9+ ref=$(git symbolic-ref HEAD 2> /dev/null) || \
10+ ref=$(git rev-parse --short HEAD 2> /dev/null) || return
11 echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
12 }
13
14diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
15index d3d3f702a362c6ebe24109369da2e6d1a8652464..14237cebe067e6a6ee46bdcb0b89127edb49de07 100644
16--- a/plugins/git/git.plugin.zsh
17+++ b/plugins/git/git.plugin.zsh
18@@ -50,13 +50,14 @@ alias gsd='git svn dcommit'
19 # Usage example: git pull origin $(current_branch)
20 #
21 function current_branch() {
22- ref=$(git symbolic-ref HEAD 2> /dev/null) || return
23+ ref=$(git symbolic-ref HEAD 2> /dev/null) || \
24+ ref=$(git rev-parse --short HEAD 2> /dev/null) || return
25 echo ${ref#refs/heads/}
26 }
27
28 function current_repository() {
29-
30- ref=$(git symbolic-ref HEAD 2> /dev/null) || return
31+ ref=$(git symbolic-ref HEAD 2> /dev/null) || \
32+ ref=$(git rev-parse --short HEAD 2> /dev/null) || return
33 echo $(git remote -v | cut -d':' -f 2)
34 }
35