mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-27 04:40:59 +01:00
Code Releases Activity

37252: vcs_info git: Compute %b correctly with "rebase --onto" of detached heads. (Follow-up to 36725.)

Browse source
This commit is contained in:
Daniel Shahaf 2015-11-30 03:23:57 +00:00
parent 4202c90b6d
commit 502d55c014
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2015-11-30 Daniel Shahaf <d.s@daniel.shahaf.name> 2015-11-30 Daniel Shahaf <d.s@daniel.shahaf.name>
* 37252: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Compute %b correctly with "rebase --onto" of
detached heads. (Follow-up to 36725.)
* 37254: Src/params.c: No functional change: change code layout * 37254: Src/params.c: No functional change: change code layout
in preparation for 37253. in preparation for 37253.

3
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -87,7 +87,8 @@ VCS_INFO_git_getbranch () {
gitbranch="$(${(z)gitsymref} 2> /dev/null)" gitbranch="$(${(z)gitsymref} 2> /dev/null)"
[[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \
&& gitbranch="$(< ${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 elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
gitbranch="$(${(z)gitsymref} 2> /dev/null)" gitbranch="$(${(z)gitsymref} 2> /dev/null)"