about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2011-07-01 07:38:45 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2011-07-01 07:38:45 +0000
commiteefe29722866f792096ec4e09f46b525445e8acc (patch)
tree981cb93ce64ed8308ad23ea6f48f9eafd3754418
parent77b0e65eda6dc01b9e7dcd1c7ebc13fc84147585 (diff)
downloadzsh-eefe29722866f792096ec4e09f46b525445e8acc.tar.gz
zsh-eefe29722866f792096ec4e09f46b525445e8acc.tar.xz
zsh-eefe29722866f792096ec4e09f46b525445e8acc.zip
29521: _git: Add `user-commands' support again.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7184bfeb8..041a2264d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 	* 29519: Completion/Unix/Command/_git: Pick up addon completions
 	from $fpath.
 
+	* 29521: Completion/Unix/Command/_git: Add `user-commands' support
+	again.
+
 2011-06-30  Frank Terbeck  <ft@bewatermyfriend.org>
 
 	* 29526: Functions/VCS_Info/vcs_info: Set `max-exports' early
@@ -15068,5 +15071,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5386 $
+* $Revision: 1.5387 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 322491092..29071d1b2 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4619,6 +4619,9 @@ _git_commands () {
       (( ${+commands[git-${a%%:*}]} )) && addons+=( $a )
   done
   _describe -t third-party-addons 'third party addon' addons && ret=0
+  local -a user_commands
+  zstyle -a ":completion:${curcontext}:" user-commands user_commands || user_commands=()
+  _describe -t user-specific-commands 'user specific command' user_commands && ret=0
   return ret
 }