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

Suraj N. Kurapati: vcs_info-examples: Mention different ways to handle remote branch names in `vi-git-remotebranch()'.

Browse source
This commit is contained in:
Frank Terbeck 2011-10-19 18:14:08 +00:00
parent 7d9c12334b
commit 8ce9c1cbe7
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,9 @@
2011-10-19 Frank Terbeck <ft@bewatermyfriend.org>
* Suraj N. Kurapati: 29828: Misc/vcs_info-examples: Mention
different ways to handle remote branch names in
`vi-git-remotebranch()'.
2011-10-17 Peter Stephenson <pws@csr.com> 2011-10-17 Peter Stephenson <pws@csr.com>
* unposted: NEWS, README, Config/version.mk, Etc/.distfiles, * unposted: NEWS, README, Config/version.mk, Etc/.distfiles,
@ -15470,5 +15476,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5478 $ * $Revision: 1.5479 $
***************************************************** *****************************************************

4
Misc/vcs_info-examples
View file

@ -205,7 +205,11 @@ function +vi-git-remotebranch() {
remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \ remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \
--symbolic-full-name 2>/dev/null)/refs\/remotes\/} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
# The first test will show a tracking branch whenever there is one. The
# second test, however, will only show the remote branch's name if it
# differs from the local one.
if [[ -n ${remote} ]] ; then if [[ -n ${remote} ]] ; then
#if [[ -n ${remote} && ${remote#*/} != ${hook_com[branch]} ]] ; then
hook_com[branch]="${hook_com[branch]} [${remote}]" hook_com[branch]="${hook_com[branch]} [${remote}]"
fi fi
} }