about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2009-01-29 18:10:45 +0000
committerClint Adams <clint@users.sourceforge.net>2009-01-29 18:10:45 +0000
commit4b2549e2f4a5a2c8dbdbb53237ca3400ffb14433 (patch)
tree32a418f08a4d1e339ca6fb6ff129f28ae1895b8b
parent8489d8eb018df51ff7325432b9cfd5e23f5c22af (diff)
downloadzsh-4b2549e2f4a5a2c8dbdbb53237ca3400ffb14433.tar.gz
zsh-4b2549e2f4a5a2c8dbdbb53237ca3400ffb14433.tar.xz
zsh-4b2549e2f4a5a2c8dbdbb53237ca3400ffb14433.zip
Ingmar Vanhassel: 26474: add "git describe --tags" completion and fix typos.
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_git5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f2794ac61..8a23408a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,8 @@
 	"git add --intent-to-add".
 	* Ingmar Vanhassel: 26473: Completion/Unix/Command/_git: complete
 	"git commit --cleanup=" and "git commit --allow-empty".
+	* Ingmar Vanhassel: 26474: Completion/Unix/Command/_git: add
+	"git describe --tags" completion and fix typos.
 
 2009-01-29  Peter Stephenson  <pws@csr.com>
 
@@ -11065,5 +11067,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4544 $                         
+* $Revision: 1.4545 $                         
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5dffa0c0d..f08c35d80 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -770,14 +770,15 @@ _git-cat-file () {
 _git-describe () {
   _arguments \
     '--all[use any ref found in "$GIT_DIR/refs/"]' \
+    '--tags[use any ref found in "$GIT_DIR/refs/tags"]' \
     '(--contains)--tags[use any tag found in "$GIT_DIR/refs/tags/"]' \
     $abbrev_arg \
     '--contains[find the tag after the commit instead of before]' \
-    '--exact-match[only output exact matches, same as --canditates=0]' \
+    '--exact-match[only output exact matches, same as --candidates=0]' \
     '--always[show uniquely abbreviated commit object as fallback]' \
     '--long[always show full format, even for exact matches]' \
     '--match=[only consider tags matching glob pattern]:pattern' \
-    '--candidates=-[consider up to given number of canditates]: :_guard "[[\:digit\:]]##" "number of canditates"' \
+    '--candidates=-[consider up to given number of candidates]: :_guard "[[\:digit\:]]##" "number of candidates"' \
     '--debug[display information about the searching strategy]' \
     '*:committish:__git_committishs' && ret=0
 }