From 23154e46e6864f35c1fc2e052c4ea14fb42014fb Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sun, 9 Dec 2018 19:41:19 +0000 Subject: 43879: vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in corner case Before this commit, the following use-case: git checkout foo^ git show foo | git am would result in a fatal error, with vcs_info_msg_N_ not set: VCS_INFO_git_getbranch:18: no such file or directory: .git/rebase-apply/onto Now they are set correctly, and HEAD's commit hash is used. --- ChangeLog | 6 ++++++ Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 129a38e80..e2508d6d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-12-13 Daniel Shahaf + + * 43879: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Fix fatal error in VCS_INFO_git_getbranch in + corner case + 2018-12-09 dana * 43871: Completion/Unix/Type/_files: Support `-F '(pat ...)'` as diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 7ae2c0b27..ceb4f978a 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -89,7 +89,7 @@ VCS_INFO_git_getbranch () { gitbranch="$(${(z)gitsymref} 2> /dev/null)" [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ && gitbranch="$(< ${actiondir}/head-name)" - [[ -z ${gitbranch} || ${gitbranch} == 'detached HEAD' ]] \ + [[ -z ${gitbranch} || ${gitbranch} == 'detached HEAD' ]] && [[ -r ${actiondir}/onto ]] \ && gitbranch="$(< ${actiondir}/onto)" elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then @@ -112,9 +112,11 @@ VCS_INFO_git_getbranch () { ## Commented out because we don't know of a case in which 'describe --contains' fails and 'name-rev --tags' succeeds. #elif gitbranch="$(${vcs_comm[cmd]} name-rev --name-only --no-undefined --tags HEAD 2>/dev/null)" ; then elif gitbranch="$(${vcs_comm[cmd]} name-rev --name-only --no-undefined --always HEAD 2>/dev/null)" ; then - elif gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." ; then - else - # Can't happen + fi + + if [[ -z ${gitbranch} ]] + then + gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." fi return 0 -- cgit 1.4.1