diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-04-11 10:13:55 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-04-13 20:59:02 +0000 |
| commit | 7929dd8cbaa195311375712ebb12b85296783f58 (patch) | |
| tree | ca5e7e8fe7905a5063c4a4e282fac6a454ba67e3 | |
| parent | 959aa75423c56f57ea7f8fa9f7a7baa32caf46ac (diff) | |
| download | zsh-7929dd8cbaa195311375712ebb12b85296783f58.tar.gz zsh-7929dd8cbaa195311375712ebb12b85296783f58.tar.xz zsh-7929dd8cbaa195311375712ebb12b85296783f58.zip | |
34885: completion: git: Fix another instance of the 34671 bug fixed in 34814
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 504df73e2..8b92eb408 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-04-13 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 34885: Completion/Unix/Command/_git: completion: git: Fix + another instance of the 34671 bug fixed in 34814 + 2015-04-13 Peter Stephenson <p.stephenson@samsung.com> * Han Pingtian: 34880: Doc/Zsh/options.yo: POSIX_TRAPS doc. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index b11c83c67..365482c0b 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5634,7 +5634,9 @@ __git_commit_objects () { local gitdir expl start declare -a commits - : ${(A)commits::=${(f)"$(_call_program commits git --no-pager log -20 --format='%h:%s')"}} + # Note: the after-the-colon part must be unique across the entire array; + # see workers/34768 + : ${(A)commits::=${(f)"$(_call_program commits git --no-pager log -20 --format='%h:\\\[%h\\\]\ %s')"}} __git_command_successful $pipestatus || return 1 _describe -t commits 'commit object name' commits || _guard '[[:xdigit:]](#c,40)' 'commit object name' |