diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 5cfd009c5..4cf84a81c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-19 Clint Adams <clint@zsh.org> + + * 25485: Completion/Unix/Command/_git: patch to allow --abbrev to + be completed before -v with git branch, from Mikael Magnusson. + 2008-08-18 Clint Adams <clint@zsh.org> * 25480: Completion/Unix/Command/_git: add more quotes to the 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]' \ |