git/contrib/completion/git-completion.zsh, branch v2.34.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.34.22021-06-02T03:49:40Zcontrib/completion: fix zsh completion regression from 59d85a2a052021-06-02T03:49:40ZDavid Aguilardavvid@gmail.com2021-06-01T20:52:29Zurn:sha1:0b18023d000ed8c0851a025fcd4fd518cb2df673
A recent change to make git-completion.bash use $__git_cmd_idx
in more places broke a number of completions on zsh because it
modified __git_main but did not update __git_zsh_main.
Notably, completions for "add", "branch", "mv" and "push" were
broken as a result of this change.
In addition to the undefined variable usage, "git mv <tab>" also
prints the following error:
__git_count_arguments:7: bad math expression:
operand expected at `"1"'
_git_mv:[:7: unknown condition: -gt
Remove the quotes around $__git_cmd_idx in __git_count_arguments
and set __git_cmd_idx=1 early in __git_zsh_main to fix the
regressions from 59d85a2a05.
This was tested on zsh 5.7.1 (x86_64-apple-darwin19.0).
Suggested-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: fix file completion regression2020-12-01T18:32:40ZFelipe Contrerasfelipe.contreras@gmail.com2020-12-01T00:54:31Zurn:sha1:c5dd0c861ab0db5ad1ecaf9508bdddca83c5cc6e
Turns out we always need to set the ignored prefix (compset) to have
similar behavior as in default Bash.
The issue can be seen with:
git show master:<tab>
Commit 94b2901cfe wrongly removed it.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
zsh: update copyright notices2020-10-28T21:31:19ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:12Zurn:sha1:af806a2c2417d21dc024bf013ec511765441e286
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: add simple version check2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:08Zurn:sha1:35a4170d8656b27d08458c3c381dd163199da4f3
A lot of people are confused about which completion script they are
using; Zsh's Git script, or Git's Zsh script.
Add a simple helper so they can type 'git zsh<tab>' and find out if they
are running the correct one: this.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: trivial simplification2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:07Zurn:sha1:bbd7f45884ca379e3cd28bb5fb8e804bcfb3360c
>From upstream bash simplification:
d9ee1e0617 (completion: simplify inner 'case' pattern in __gitcomp())
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: add alias descriptions2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:06Zurn:sha1:2769e567d140a51e4e6e426fe776005ae889e9b0
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: improve command tags2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:05Zurn:sha1:9d760527addc576c87e9b0e66b63376e580b434a
There's no need to use _alternative and repeat a lot of the code.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: refactor command completion2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:04Zurn:sha1:9a397ea5ad59e64ff6eebfd1d7dad43aac790e0a
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: shuffle functions around2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:03Zurn:sha1:46af9b371929c3c3c9cc0f5b4aa9bcb3089e6405
Just to have a nice order.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: zsh: simplify file_direct2020-10-28T21:30:59ZFelipe Contrerasfelipe.contreras@gmail.com2020-10-28T02:07:02Zurn:sha1:5d64fb20511270ffb2d939210a5afe66419f69ab
It's exactly the same as __gitcomp_file() with no prefix.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>