diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-12-03 00:18:56 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-12-03 00:18:56 +0100 |
| commit | 2a9cd3d2341a123b611d697ecf014aadabbc4a51 (patch) | |
| tree | bb2c3c27ca095a3456bacc1b03e309d750c777d2 /Functions/VCS_Info | |
| parent | 3afa736d69960022967090aa25915fc18da01ead (diff) | |
| parent | c86c20ae577312b01a2a1c13c312b4b5b21fe990 (diff) | |
| download | zsh-2a9cd3d2341a123b611d697ecf014aadabbc4a51.tar.gz zsh-2a9cd3d2341a123b611d697ecf014aadabbc4a51.zip | |
Merge tag 'zsh-5.2' into debian
Release 5.2 of zsh.
Diffstat (limited to 'Functions/VCS_Info')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 704c1890e..e1cee7439 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -87,7 +87,8 @@ VCS_INFO_git_getbranch () { gitbranch="$(${(z)gitsymref} 2> /dev/null)" [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ && gitbranch="$(< ${actiondir}/head-name)" - [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/ORIG_HEAD)" + [[ -z ${gitbranch} || ${gitbranch} == 'detached HEAD' ]] \ + && gitbranch="$(< ${gitdir}/ORIG_HEAD)" elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then gitbranch="$(${(z)gitsymref} 2> /dev/null)" |