diff options
| author | Daniel Hahler <git@thequod.de> | 2018-02-14 01:18:59 +0100 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2018-02-22 23:41:13 +0100 |
| commit | 1142e2dedb628352bb6a45f58fed0fd29b0725a9 (patch) | |
| tree | c370535fd0916cf0e5fe6ee7c5d04509e5a89413 | |
| parent | 5b946f6c4ddb82d2436c5012e719d470802987d0 (diff) | |
| download | zsh-1142e2dedb628352bb6a45f58fed0fd29b0725a9.tar.gz zsh-1142e2dedb628352bb6a45f58fed0fd29b0725a9.tar.xz zsh-1142e2dedb628352bb6a45f58fed0fd29b0725a9.zip | |
42364: _git: fix __git_ignore_line to ignore the current word
Before this patch "git branch -d master<tab>" would result in "no matches found", while "master" itself should get completed here. The "(bQ)" (added in 527badc23, via 38129?!) does not seem to be necessary anymore: with files "f\[a-z\]o" and "foo", "git add f[a-z]o <tab>" offers "f\[a-z\]o", but not "foo".
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index d1696e196..4fe0bf5d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-02-22 Daniel Hahler <zsh@thequod.de> + + * 42364: Completion/Unix/Command/_git: _git: fix __git_ignore_line to + ignore the current word. + 2018-02-17 Peter Stephenson <p.w.stephenson@ntlworld.com> * 42362: Src/jobs.c: protet REPORTTIME logic from bad status. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 9f0225fab..4df851c98 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5596,12 +5596,7 @@ __git_describe_commit () { # . (( $+functions[__git_ignore_line] )) || __git_ignore_line () { - declare -a ignored - ignored=() - ((CURRENT > 1)) && - ignored+=(${(bQ)line[1,CURRENT-1]}) - ((CURRENT < $#line)) && - ignored+=(${(bQ)line[CURRENT+1,-1]}) + local -a ignored=(${line:#${words[CURRENT]}}) $* -F ignored } |