From 2c2d4f9627258640df44a4da4e5627e4d8c5044d Mon Sep 17 00:00:00 2001 From: Marc Finet Date: Tue, 16 Sep 2014 22:57:26 +0200 Subject: 33188: vcs_info git: set rrn before using it This would fix handling get-revision, check-for-changes or check-for-staged-changes when set per repository. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Functions') diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 8f9aa2a19..24efab22e 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -115,6 +115,8 @@ VCS_INFO_git_getbranch () { gitdir=${vcs_comm[gitdir]} VCS_INFO_git_getbranch ${gitdir} +gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) +rrn=${gitbase:t} if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD) else @@ -154,8 +156,6 @@ fi VCS_INFO_adjust VCS_INFO_git_getaction ${gitdir} -gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) -rrn=${gitbase:t} local patchdir=${gitdir}/patches/${gitbranch} if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \ -- cgit 1.4.1