mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

33188: vcs_info git: set rrn before using it

Browse source 
This would fix handling get-revision, check-for-changes or
check-for-staged-changes when set per repository.
This commit is contained in:
Marc Finet 2014-09-16 22:57:26 +02:00 committed by Frank Terbeck
parent cd09b81626
commit 2c2d4f9627
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-09-16 Marc Finet <m.dreadlock@gmail.com>
* 33188: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: set rrn before using it
2014-09-16 Mikael Magnusson <mikachu@gmail.com> 2014-09-16 Mikael Magnusson <mikachu@gmail.com>
* 33136: Doc/Zsh/expn.yo, Src/glob.c: P glob qualifier appends * 33136: Doc/Zsh/expn.yo, Src/glob.c: P glob qualifier appends

4
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -115,6 +115,8 @@ VCS_INFO_git_getbranch () {
gitdir=${vcs_comm[gitdir]} gitdir=${vcs_comm[gitdir]}
VCS_INFO_git_getbranch ${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 if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then
gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD) gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD)
else else
@ -154,8 +156,6 @@ fi
VCS_INFO_adjust VCS_INFO_adjust
VCS_INFO_git_getaction ${gitdir} VCS_INFO_git_getaction ${gitdir}
gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel )
rrn=${gitbase:t}
local patchdir=${gitdir}/patches/${gitbranch} local patchdir=${gitdir}/patches/${gitbranch}
if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \ if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \