From a5c5174c00a26850e710565cd792522f064b59a8 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Tue, 19 Aug 2008 01:00:59 +0000 Subject: 25485: patch to allow --abbrev to be completed before -v with git branch, from Mikael Magnusson. --- Completion/Unix/Command/_git | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Completion/Unix') 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]' \ -- cgit 1.4.1