From 502d55c01494fabd1d98c67aab0a9746d59b715a Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 30 Nov 2015 03:23:57 +0000 Subject: 37252: vcs_info git: Compute %b correctly with "rebase --onto" of detached heads. (Follow-up to 36725.) --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Functions/VCS_Info/Backends/VCS_INFO_get_data_git') 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)" -- cgit 1.4.1