Re: Fix a typo in _git.

[Clint Adams <clint@zsh.org>]

On Tue, Aug 19, 2008 at 02:37:34AM +0200, Mikael Magnusson wrote:
> Hmm yes, but what if you want to type --no-abbrev -v in that order?

Good point.  In that case, the my_abbrev bit seems like more trouble
than it's worth.


From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 6 Jun 2008 02:07:03 +0000 (+0200)
Subject: _git: What is my_abbrev about?
X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=6d178b4a0ad761e2e996dd8ee4de82604b6ee129

_git: What is my_abbrev about?
---

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9236e0b..860cc94 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]' \