diff options
| author | Daniel Hahler <git@thequod.de> | 2015-05-19 07:41:57 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2015-05-19 07:49:48 +0200 |
| commit | ed3e5f521d1243981831d7e084225b03e205ae38 (patch) | |
| tree | 1c9f03459d2d103529081da243f6716727454481 | |
| parent | d0057538d3a30f1abaddf00171888c5d3527a067 (diff) | |
| download | zsh-ed3e5f521d1243981831d7e084225b03e205ae38.tar.gz zsh-ed3e5f521d1243981831d7e084225b03e205ae38.tar.xz zsh-ed3e5f521d1243981831d7e084225b03e205ae38.zip | |
Completion/Unix/Command/_git: remove -2 with __git_recent_commits
Remove "-2" for _describe in __git_recent_commits. This fixes the duplicate entries issue, because __git_recent_commits gets called twice for _git-checkout (for __git_revisions and __git_tree_ishs): 1. __git_commit_objects_prefer_recent _alternative __git_commits __git_revisions _alternative _git-checkout 2. __git_commit_objects_prefer_recent _alternative __git_commits __git_tree_ishs _alternative _git-checkout
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0a7f6aa35..f385ac3ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,11 @@ * 35204: Completion/Unix/Command/_git: fix quoting in previous commit commit (35164). + * 35209: Completion/Unix/Command/_git: remove -2 _describe in + __git_recent_commits. This fixes duplicate entries, because + __git_recent_commits gets called twice for _git-checkout + (for __git_revisions and __git_tree_ishs). + 2015-05-19 Daniel Shahaf <d.s@daniel.shahaf.name> * users/20222: Completion/Unix/Command/_git: users/20222: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 18d895469..a0ec3434a 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5713,7 +5713,7 @@ __git_recent_commits () { expl=() _wanted heads expl 'head' compadd "$@" -a - heads && ret=0 expl=() - _describe -2Vx -t commits 'recent commit object name' descr && ret=0 + _describe -Vx -t commits 'recent commit object name' descr && ret=0 return $ret } |