From: Frank Terbeck <ft@bewatermyfriend.org>
To: zsh-workers@zsh.org
Cc: "Suraj N. Kurapati" <sunaku@gmail.com>
Subject: Re: [PATCH] Misc/vcs_info-examples - avoid showing remote branch
Date: Wed, 19 Oct 2011 19:46:14 +0200 [thread overview]
Message-ID: <871uu8j2mx.fsf@ft.bewatermyfriend.org> (raw)
In-Reply-To: <87aa8wj4dx.fsf@ft.bewatermyfriend.org> (Frank Terbeck's message of "Wed, 19 Oct 2011 19:08:26 +0200")
Frank Terbeck wrote:
[...]
> + #if [[ -n ${remote} && ${remote#*/} !=3D ${hook_com[branch]} ]] ; then
Mikael on IRC caught the stray "3D"... So:
Misc/vcs_info-examples | 4 ++++
1 file changed, 4 insertions(+)
Index: Misc/vcs_info-examples
===================================================================
RCS file: /cvsroot/zsh/zsh/Misc/vcs_info-examples,v
retrieving revision 1.6
diff -u -p -r1.6 vcs_info-examples
--- Misc/vcs_info-examples 1 Jun 2011 21:21:04 -0000 1.6
+++ Misc/vcs_info-examples 19 Oct 2011 17:44:49 -0000
@@ -205,7 +205,11 @@ function +vi-git-remotebranch() {
remote=${$(git rev-parse --verify ${hook_com[branch]}@{upstream} \
--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} && ${remote#*/} != ${hook_com[branch]} ]] ; then
hook_com[branch]="${hook_com[branch]} [${remote}]"
fi
}
prev parent reply other threads:[~2011-10-19 17:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20111019033659.7718667e@gmail.com>
[not found] ` <87vcrli5tf.fsf@ft.bewatermyfriend.org>
2011-10-19 17:08 ` Frank Terbeck
2011-10-19 17:46 ` Frank Terbeck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871uu8j2mx.fsf@ft.bewatermyfriend.org \
--to=ft@bewatermyfriend.org \
--cc=sunaku@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).