mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-28 18:40:55 +02:00
Code Releases Activity

39822: _git: remove "-A '-*'" with _arguments for some commands

Browse source 
With e.g. `git rebase origin/master` you can have options like
`--no-autosquash` after the argument.

I have tried the commands where this patch removes `-A`.
Commands like `git fetch-pack` that do not support options after
arguments are left unchanged.
This commit is contained in:
Daniel Hahler 2016-11-03 16:00:45 +01:00
parent 4073a6655c
commit d90775fc29
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2016-11-03 Daniel Hahler <zsh@thequod.de>
* 39822: Completion/Unix/Command/_git: remove "-A '-*'" with
_arguments for some commands.
2016-11-03 Peter Stephenson <p.stephenson@samsung.com> 2016-11-03 Peter Stephenson <p.stephenson@samsung.com>
* 39815: Src/lex.c, Test/D04parameter.ztst: read input to end * 39815: Src/lex.c, Test/D04parameter.ztst: read input to end

10
Completion/Unix/Command/_git
View file

@ -1383,7 +1383,7 @@ _git-rebase () {
'(--autosquash )--no-autosquash[do not check for auto-squash boundaries]') '(--autosquash )--no-autosquash[do not check for auto-squash boundaries]')
fi fi
_arguments -A '-*' \ _arguments \
- actions \ - actions \
'(-)--continue[continue after resolving merge conflict]' \ '(-)--continue[continue after resolving merge conflict]' \
'(-)--abort[abort current rebase]' \ '(-)--abort[abort current rebase]' \
@ -1921,7 +1921,7 @@ _git-tag () {
) )
fi fi
_arguments -A '-*' \ _arguments \
- creation \ - creation \
'(-a --annotate -s --sign -u --local-user)'{-a,--annotate}'[create an unsigned, annotated tag]' \ '(-a --annotate -s --sign -u --local-user)'{-a,--annotate}'[create an unsigned, annotated tag]' \
'(-a --annotate -s --sign -u --local-user)'{-s,--sign}'[create a signed and annotated tag]' \ '(-a --annotate -s --sign -u --local-user)'{-s,--sign}'[create a signed and annotated tag]' \
@ -4539,7 +4539,7 @@ _git-pack-objects () {
fi fi
# NOTE: --index-version is only used by the Git test suite. # NOTE: --index-version is only used by the Git test suite.
_arguments -A '-*' \ _arguments \
'(-q --quiet)'{-q,--quiet}"[don't report progress]" \ '(-q --quiet)'{-q,--quiet}"[don't report progress]" \
'(-q --quiet --all-progress)--progress[show progress meter]' \ '(-q --quiet --all-progress)--progress[show progress meter]' \
'(-q --quiet --progress --all-progress-implied)--all-progress[show progress meter during object writing phase]' \ '(-q --quiet --progress --all-progress-implied)--all-progress[show progress meter during object writing phase]' \
@ -4876,7 +4876,7 @@ _git-ls-files () {
(( $+functions[_git-ls-remote] )) || (( $+functions[_git-ls-remote] )) ||
_git-ls-remote () { _git-ls-remote () {
# TODO: repository needs fixing # TODO: repository needs fixing
_arguments -A '-*' \ _arguments \
'(-q --quiet)'{-q,--quiet}"[don't print remote URL]" \ '(-q --quiet)'{-q,--quiet}"[don't print remote URL]" \
'--upload-pack=[specify path to git-upload-pack on remote side]:remote path' \ '--upload-pack=[specify path to git-upload-pack on remote side]:remote path' \
'(-h --heads)'{-h,--heads}'[show only refs under refs/heads]' \ '(-h --heads)'{-h,--heads}'[show only refs under refs/heads]' \
@ -5007,7 +5007,7 @@ _git-show-ref () {
(( $+functions[_git-unpack-file] )) || (( $+functions[_git-unpack-file] )) ||
_git-unpack-file () { _git-unpack-file () {
_arguments -A '-*' \ _arguments \
'(:)-h[display usage information]' \ '(:)-h[display usage information]' \
'(-): :__git_blobs' '(-): :__git_blobs'
} }