diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-02-07 18:50:54 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-02-07 18:50:54 +0000 |
| commit | f8e05427db486637016b76e8164c46d0091f234c (patch) | |
| tree | ded746b51ba2938973a309d8726e5e33b8c1eb27 /Functions/VCS_Info/Backends | |
| parent | 7da34421c15d9b5a2e27c4afaadcb9b28a571bd0 (diff) | |
| download | zsh-f8e05427db486637016b76e8164c46d0091f234c.tar.gz zsh-f8e05427db486637016b76e8164c46d0091f234c.zip | |
Frank: 27679: better logic in VCS_INFO_get_data_git
Diffstat (limited to 'Functions/VCS_Info/Backends')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 7b961a4a7..bf7c47927 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -54,23 +54,31 @@ VCS_INFO_git_getaction () { } VCS_INFO_git_getbranch () { - local gitbranch gitdir=$1 + local gitbranch gitdir=$1 tmp actiondir local gitsymref="${vcs_comm[cmd]} symbolic-ref HEAD" - if [[ -d "${gitdir}/rebase-apply" ]] \ - || [[ -d "${gitdir}/rebase" ]] \ - || [[ -d "${gitdir}/../.dotest" ]] \ - || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then + actiondir='' + for tmp in "${gitdir}/rebase-apply" \ + "${gitdir}/rebase" \ + "${gitdir}/../.dotest"; do + if [[ -d ${tmp} ]]; then + actiondir=${tmp} + break + fi + done + if [[ -n ${actiondir} ]]; then + gitbranch="$(${(z)gitsymref} 2> /dev/null)" + [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ + && gitbranch="$(< ${actiondir}/head-name)" + + elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then gitbranch="$(${(z)gitsymref} 2> /dev/null)" - [[ -z ${gitbranch} ]] && [[ -r ${gitdir}/rebase-apply/head-name ]] \ - && gitbranch="$(< ${gitdir}/rebase-apply/head-name)" + [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/MERGE_HEAD)" - elif [[ -f "${gitdir}/rebase-merge/interactive" ]] \ - || [[ -d "${gitdir}/rebase-merge" ]] ; then + elif [[ -d "${gitdir}/rebase-merge" ]] ; then gitbranch="$(< ${gitdir}/rebase-merge/head-name)" - elif [[ -f "${gitdir}/.dotest-merge/interactive" ]] \ - || [[ -d "${gitdir}/.dotest-merge" ]] ; then + elif [[ -d "${gitdir}/.dotest-merge" ]] ; then gitbranch="$(< ${gitdir}/.dotest-merge/head-name)" else |