about summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-19 01:00:59 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-19 01:00:59 +0000
commita5c5174c00a26850e710565cd792522f064b59a8 (patch)
tree4c5a6e68ca364ffe1e6fac73c4fae4b77657d86e /Completion/Unix/Command
parent51ba8a4faf17650bc3136e74d7221414dc1e27f9 (diff)
downloadzsh-a5c5174c00a26850e710565cd792522f064b59a8.tar.gz
zsh-a5c5174c00a26850e710565cd792522f064b59a8.tar.xz
zsh-a5c5174c00a26850e710565cd792522f064b59a8.zip
25485: patch to allow --abbrev to be completed before -v with git branch, from Mikael Magnusson.
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_git8
1 files changed, 2 insertions, 6 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9236e0b1a..860cc940b 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1475,11 +1475,6 @@ _git-bisect () {
 # TODO: complete branch names?
 (( $+functions[_git-branch] )) ||
 _git-branch () {
-  local my_abbrev_arg
-  if (( words[(I)-v] > 0 && words[(I)-v] < CURRENT )); then
-    my_abbrev_arg=$abbrev_arg
-  fi
-
   declare -a dependent_deletion_args
   if (( words[(I)-d] || words[(I)-D] )); then
     dependent_deletion_args=(
@@ -1502,7 +1497,8 @@ _git-branch () {
       '(   -a)-r[list only the remote-tracking branches]' \
       '(-r   )-a[list both remote-tracking branches and local branches]' \
       '-v[show SHA1 and commit subject line for each head]' \
-      $my_abbrev_arg \
+      $abbrev_arg \
+      '--no-abbrev[do not abbreviate sha1s]' \
     - create \
       '-l[create the branch'\''s reflog]' \
       '-f[force the creation of a new branch]' \