summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Misc/vcs_info-examples4
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fc8de46c..18521a39b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* unposted: NEWS, README, Config/version.mk, Etc/.distfiles,
@@ -15470,5 +15476,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5478 $
+* $Revision: 1.5479 $
 *****************************************************
diff --git a/Misc/vcs_info-examples b/Misc/vcs_info-examples
index 860297c9e..ba3b2c367 100644
--- a/Misc/vcs_info-examples
+++ b/Misc/vcs_info-examples
@@ -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
 }