about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 022c77dd2..6cf44b488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-01  Clint Adams  <clint@zsh.org>
 
+	* Nikolai Weibull: 23889: Completion/Unix/Command/_git: fix -o
+	completion in git cvsimport.
+
 	* Nikolai Weibull: 23888: Completion/Unix/Command/_git: complete
 	branch names and cached files after git log.
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 25d446869..3771da1a4 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2001,7 +2001,7 @@ _git-cvsimport () {
     '-k[remove keywords from source files in the CVS archive]' \
     '-m[attempt to detect merges based on the commit message]' \
     '-M[attempt to detect merges based on the commit message with custom pattern]:pattern' \
-    '-o[specify the branch into which you wish to import]:branch:__git_branches' \
+    '-o[specify the branch into which you wish to import]:branch:__git_branch_names' \
     '-P[read cvsps output file]:file:_files' \
     '-p[specify additionaly options for cvsps]:cvsps-options' \
     '-s[substitute the "/" character in branch names with given substitution]:substitute' \