diff options
| author | Robby Russell <robby@planetargon.com> | 2012-12-02 12:42:38 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-02 12:42:38 -0800 |
| commit | 9977afc0b5a4c92498ab027d94561d985ff0325c (patch) | |
| tree | f0d75f06a9b51370a7eab650b20a60da4835cf4a | |
| parent | 2e5a689c05f02f7403055367a5dbc3b041829c8b (diff) | |
| parent | 027fcccc9256aaf63e0d1b812069a1a0880f46fa (diff) | |
| download | zsh-9977afc0b5a4c92498ab027d94561d985ff0325c.tar.gz zsh-9977afc0b5a4c92498ab027d94561d985ff0325c.tar.bz2 zsh-9977afc0b5a4c92498ab027d94561d985ff0325c.zip | |
Merge pull request #1263 from tedv/headless-git
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 258b1df8f..52477baf6 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 885bbe3be..6b7bd374c 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -60,13 +60,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) } |