X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=7a33c2d34354a9422c14cb00b78d0b4cb606e1ca;hb=bd6b021e73042e1c31673cc5b2d2a7cbc3408dda;hp=1c38fcd1c6ca59be96b1dc7f084058feeb9826bc;hpb=cb790c798989ac8ec7fd1f55e9a4a6ed956c03d4;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 1c38fcd..7a33c2d 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1101,7 +1101,7 @@ VCS_INFO_git_getaction () { #{{{ else gitaction="am/rebase" fi - print '%s' ${gitaction} + printf '%s' ${gitaction} return 0 fi done @@ -1142,6 +1142,7 @@ VCS_INFO_git_getbranch () { #{{{ || [[ -d "${gitdir}/../.dotest" ]] \ || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then gitbranch="$(${(z)gitsymref} 2> /dev/null)" + [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/rebase-apply/head-name)" elif [[ -f "${gitdir}/rebase-merge/interactive" ]] \ || [[ -d "${gitdir}/rebase-merge" ]] ; then