summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-02-28 17:20:43 +0000
committerClint Adams <clint@users.sourceforge.net>2008-02-28 17:20:43 +0000
commit969913577e2466c4ef4348b3088bf057277e2afd (patch)
tree54a8fef9fc005b0bbf48bb3074a04d79e668510d
parent3dd3f72bd91355e4e01711b12cfe1437f65732b4 (diff)
downloadzsh-969913577e2466c4ef4348b3088bf057277e2afd.tar.gz
zsh-969913577e2466c4ef4348b3088bf057277e2afd.tar.xz
zsh-969913577e2466c4ef4348b3088bf057277e2afd.zip
24622: add completion for 'git bisect skip' and 'git bisect run'.
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_git9
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0ce27c10..a7c36b32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+2008-02-28  Clint Adams  <clint@zsh.org>
+
+	* 24622: Completion/Unix/Command/_git: add completion for
+	'git bisect skip' and 'git bisect run'.
+
 2008-02-27  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 24618: Test/D07multibyte.ztst: use "sort" to avoid making
 	assumptions about sorting of UTF-8 files.
 
-2008-02-22  Clint Adams  <clint@zsh.org>
+2008-02-27  Clint Adams  <clint@zsh.org>
 
 	* 24617: Doc/Makefile.in: add '.' to the yodl include path
 	for when files are passed as ../../Doc/*.yo.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 516a3bf28..c597d94f3 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1395,6 +1395,8 @@ _git-bisect () {
     reset:"finish bisection search and return to the given branch (or master)"
     start:"reset bisection state and start a new bisection"
     visualize:"show the remaining revisions in gitk"
+    skip:"choose a nearby commit"
+    run:"run evaluation script"
   )
 
   if (( CURRENT == 2 )); then
@@ -1405,7 +1407,7 @@ _git-bisect () {
         _arguments \
           '2:revision:__git_commits' && ret=0
         ;;
-      (good)
+      (good|skip)
         _arguments \
           '*:revision:__git_commits' && ret=0
         ;;
@@ -1417,6 +1419,11 @@ _git-bisect () {
         _arguments \
           '2:branch:__git_heads' && ret=0
         ;;
+      (run)
+        _arguments \
+          '*::arguments: _normal' && ret=0
+        ;;
+
       (*)
         _nothing
         ;;