9977afc0b5a4c92498ab027d94561d985ff0325c

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge pull request #1263 from tedv/headless-git

Make git use sha when branch name is missing.

Diff

 1diff --git a/lib/git.zsh b/lib/git.zsh
 2index 258b1df8f477c588ddfd28a0ad80580757021a67..52477baf68539374a33eef7e1eb63765fb1811ed 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 885bbe3beebc3fc790bddb7c667bbf93e72c7174..6b7bd374c7a6ee1922d260efa9ea5f9558517dba 100644
16--- a/plugins/git/git.plugin.zsh
17+++ b/plugins/git/git.plugin.zsh
18@@ -60,13 +60,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